diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:36:36 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-12 18:55:09 +0000 |
commit | 563ce3888f3c04abcc96ba236b20c7a822bc88e2 (patch) | |
tree | e7dfea69e3e2e2f84d98fe717705d7fb072aa227 | |
parent | 8d75ac2aa816cf2df1726cb091ba9edb889231d1 (diff) |
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: Ic2ea6f6cae734b8094ba0617f67435f5a4fb2b14
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r-- | src/declarative/declarative.pro | 9 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 8 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro | 8 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 70bfd357..32113b60 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -4,14 +4,9 @@ qtHaveModule(xmlpatterns): QT_PRIVATE = xmlpatterns else: DEFINES += QT_NO_XMLPATTERNS MODULE=declarative -MODULE_PLUGIN_TYPES = \ - qml1tooling - ANDROID_BUNDLED_FILES = \ imports -load(qt_module) - DEFINES += QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 @@ -39,3 +34,7 @@ DEFINES += QT_NO_OPENTYPE blackberry: { DEFINES += CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE } + +MODULE_PLUGIN_TYPES = \ + qml1tooling +load(qt_module) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 09b993b5..7b195e71 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,10 +1,6 @@ TARGET = qmldbg_inspector QT += declarative declarative-private gui widgets core-private -PLUGIN_TYPE = qml1tooling -PLUGIN_CLASS_NAME = QtQuick1Plugin -load(qt_plugin) - INCLUDEPATH *= $$PWD SOURCES += \ @@ -45,3 +41,7 @@ HEADERS += \ abstracttool.h OTHER_FILES += qtquick1plugin.json + +PLUGIN_TYPE = qml1tooling +PLUGIN_CLASS_NAME = QtQuick1Plugin +load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index 20ced897..783c7554 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -1,10 +1,6 @@ TARGET = qmldbg_tcp_qtdeclarative QT += declarative declarative-private network -PLUGIN_TYPE = qml1tooling -PLUGIN_CLASS_NAME = QTcpServerConnection -load(qt_plugin) - SOURCES += \ qtcpserverconnection.cpp @@ -12,3 +8,7 @@ HEADERS += \ qtcpserverconnection.h OTHER_FILES += qtcpserverconnection.json + +PLUGIN_TYPE = qml1tooling +PLUGIN_CLASS_NAME = QTcpServerConnection +load(qt_plugin) |