Changeset 121324 in webkit

Timestamp:

Jun 27, 2012, 12:26:34 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Fix compilation of example platform plugin with Qt 5

Reviewed by Kenneth Christiansen.

Use QLatin1String where appropriate and use the Qt 5 plugin
system with Qt 5.

• examples/platformplugin/WebPlugin.cpp:

(SingleSelectionPopup::SingleSelectionPopup):
(MultipleItemListDelegate::MultipleItemListDelegate):
(MultipleSelectionPopup::MultipleSelectionPopup):

• examples/platformplugin/WebPlugin.h:

(WebPlugin):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• examples/platformplugin/WebPlugin.cpp (modified) (5 diffs)
• examples/platformplugin/WebPlugin.h (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-06-27  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix compilation of example platform plugin with Qt 5
+
+        Reviewed by Kenneth Christiansen.
+
+        Use QLatin1String where appropriate and use the Qt 5 plugin
+        system with Qt 5.
+
+        * examples/platformplugin/WebPlugin.cpp:
+        (SingleSelectionPopup::SingleSelectionPopup):
+        (MultipleItemListDelegate::MultipleItemListDelegate):
+        (MultipleSelectionPopup::MultipleSelectionPopup):
+        * examples/platformplugin/WebPlugin.h:
+        (WebPlugin):
+
 2012-06-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.cpp

@@ -127 +127 @@
         setWindowTitle(QString::fromUtf8(title));
     else
-        setWindowTitle("Select item");
+        setWindowTitle(QLatin1String("Select item"));
 
     QHBoxLayout* hLayout = new QHBoxLayout(this);
@@ -151 +151 @@
            : QStyledItemDelegate(parent)
     {
-        tickMark = QIcon::fromTheme("widgets_tickmark_list").pixmap(48, 48);
+        tickMark = QIcon::fromTheme(QLatin1String("widgets_tickmark_list")).pixmap(48, 48);
     }
 
@@ -173 +173 @@
         setWindowTitle(QString::fromUtf8(title));
     else
-        setWindowTitle("Select items");
+        setWindowTitle(QLatin1String("Select items"));
 
     QHBoxLayout* hLayout = new QHBoxLayout(this);
@@ -198 +198 @@
         done->setText(QString::fromUtf8(title));
     else
-        done->setText("Done");
+        done->setText(QLatin1String("Done"));
 
     done->setMinimumWidth(178);
@@ -316 +316 @@
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 Q_EXPORT_PLUGIN2(platformplugin, WebPlugin)
+#endif

trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.h

@@ -138 +138 @@
     Q_OBJECT
     Q_INTERFACES(QWebKitPlatformPlugin)
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "org.qt-project.QtWebKit.PlatformPluginInterface")
+#endif
 public:
     virtual bool supportsExtension(Extension extension) const;