diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/qt/examples | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/qt/examples')
| -rw-r--r-- | Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.cpp | 8 | ||||
| -rw-r--r-- | Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.cpp b/Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.cpp index d991ab162..339bade03 100644 --- a/Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.cpp +++ b/Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.cpp @@ -39,13 +39,7 @@ void WebNotificationWidget::showNotification(const QWebNotificationData* data) QGridLayout* layout = new QGridLayout(this); layout->addWidget(new QLabel(data->title()), 0, 0, 1, 5); int messagePosition = 0; - QPixmap pixmap; - if (data->iconData().length() && pixmap.loadFromData(data->iconData())) { - QLabel* label = new QLabel; - label->setPixmap(pixmap); - layout->addWidget(label, 1, 0, 1, 1); - messagePosition++; - } + QLabel* messageLabel = new QLabel(data->message()); messageLabel->setMask(bitmap); messageLabel->setWordWrap(true); diff --git a/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h b/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h index b28c05801..aa8ec7ea6 100644 --- a/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h +++ b/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h @@ -75,7 +75,7 @@ public: virtual const QString title() const = 0; virtual const QString message() const = 0; - virtual const QByteArray iconData() const = 0; + virtual const QUrl iconUrl() const = 0; virtual const QUrl openerPageUrl() const = 0; }; @@ -180,7 +180,7 @@ public: }; QT_BEGIN_NAMESPACE -Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.8"); +Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.9"); QT_END_NAMESPACE #endif // QWEBKITPLATFORMPLUGIN_H |