summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-12 16:36:36 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-12 18:55:09 +0000
commit563ce3888f3c04abcc96ba236b20c7a822bc88e2 (patch)
treee7dfea69e3e2e2f84d98fe717705d7fb072aa227 /src/declarative
parent8d75ac2aa816cf2df1726cb091ba9edb889231d1 (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>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/declarative.pro9
1 files changed, 4 insertions, 5 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)