diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
commit | c6713e212ef0b97c45d6466b73220567e94a05f1 (patch) | |
tree | 8774d26bf05f2087c510d16da42bfd0dc59a54b1 /tests/auto/testplugin | |
parent | ce97d9c8ef4e6f8cb2166065b6732cad3cccf604 (diff) | |
parent | 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 (diff) | |
download | qtquickcontrols-c6713e212ef0b97c45d6466b73220567e94a05f1.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
Diffstat (limited to 'tests/auto/testplugin')
-rw-r--r-- | tests/auto/testplugin/testplugin.h | 2 | ||||
-rw-r--r-- | tests/auto/testplugin/testplugin.pro | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/auto/testplugin/testplugin.h b/tests/auto/testplugin/testplugin.h index 8f310372..05ce0765 100644 --- a/tests/auto/testplugin/testplugin.h +++ b/tests/auto/testplugin/testplugin.h @@ -35,7 +35,7 @@ class TestPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "testplugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "testplugin.json") public: void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro index dfdd1a81..7e16087a 100644 --- a/tests/auto/testplugin/testplugin.pro +++ b/tests/auto/testplugin/testplugin.pro @@ -29,10 +29,7 @@ DESTDIR = $$TARGETPATH !equals(PWD, $$OUT_PWD) { # move qmldir alongside the plugin if shadow build - qmldirfile.input = QMLDIR - qmldirfile.output = $$DESTDIR/qmldir - qmldirfile.variable_out = PRE_TARGETDEPS - qmldirfile.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - qmldirfile.CONFIG = no_link no_clean - QMAKE_EXTRA_COMPILERS += qmldirfile + qmldirfile.files = $$QMLDIR + qmldirfile.path = $$DESTDIR + COPIES += qmldirfile } |