diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-27 11:50:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-27 11:51:03 +0200 |
| commit | 7bf2d2add7630f0199078631538b695f06a5de58 (patch) | |
| tree | 4af8040a4e0d21181e6af7c6aee2509fd4577d5e | |
| parent | a2120f40d275285dd78938ebe599c2574b87c373 (diff) | |
| parent | 6c536617acb53b03be44bcb84767eb2bf35a16a2 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I8da8707534812f716c31adb5c3dc90b635b9184b
| -rw-r--r-- | Source/WebKit/qt/declarative/experimental/plugin.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 1 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebKit/qt/declarative/experimental/plugin.cpp b/Source/WebKit/qt/declarative/experimental/plugin.cpp index e6ffeda6e..66343af7c 100644 --- a/Source/WebKit/qt/declarative/experimental/plugin.cpp +++ b/Source/WebKit/qt/declarative/experimental/plugin.cpp @@ -45,7 +45,7 @@ public: class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: virtual void registerTypes(const char* uri) { diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 1aa00a900..2ffc8ea0f 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class WebKitQmlPlugin : public QQmlExtensionPlugin { - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") Q_OBJECT public: #if defined(HAVE_WEBKIT2) diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 25df3c2f8..9eeac75dc 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -129,6 +129,7 @@ defineTest(finalizeConfigure) { production_build:android { addReasonForSkippingBuild("Build not supported on Android.") } + QT_FOR_CONFIG += gui-private production_build:qtConfig(mirclient) { addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") } diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index e425fc46b..328a8be7e 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -48,6 +48,7 @@ defineTest(detectFeatures) { # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt # is using the system libraries, use them to take advantage of the WebCore image decoders as well. + QT_FOR_CONFIG += gui-private qtConfig(system-jpeg): WEBKIT_CONFIG += use_libjpeg else: CONFIGURE_WARNINGS += "Qt not configured to use system libjpeg, QImageDecoder will decode JPEG images" |