diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-27 08:47:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-27 08:47:35 +0200 |
| commit | da374438be8f34f746f359aa39ae6c59fd1c4854 (patch) | |
| tree | 2f3e2a2b93b39dfb825339c98580f23e824fad0e /tests/manual/highdpi | |
| parent | 1be53f4e143d417d60cd1f9a292193dab59b5b20 (diff) | |
| parent | 2e6f7f362e62c3285e7d395aca607502c8e8160e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickimagebase.cpp
src/imports/layouts/plugin.cpp
Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21
Diffstat (limited to 'tests/manual/highdpi')
| -rw-r--r-- | tests/manual/highdpi/imageprovider.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/manual/highdpi/imageprovider.cpp b/tests/manual/highdpi/imageprovider.cpp index 1856a1ea9a..33a69cb87e 100644 --- a/tests/manual/highdpi/imageprovider.cpp +++ b/tests/manual/highdpi/imageprovider.cpp @@ -79,7 +79,7 @@ public: class ImageProviderExtensionPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: void registerTypes(const char *uri) { @@ -95,7 +95,4 @@ public: }; -#define QQmlExtensionInterface_iid "org.qt-project.Qt.QQmlExtensionInterface" - - #include "imageprovider.moc" |