summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-12 16:37:01 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-25 16:47:42 +0000
commit751c105984532f41de4c5f712f36f4c2579a60b7 (patch)
tree55088527d9c6b7dc6e780d82579b4705b6972de7
parent525c18f7780a39474e71790d54cf90de29bc1fd6 (diff)
downloadqtscript-751c105984532f41de4c5f712f36f4c2579a60b7.tar.gz
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: I0cb70c7954b4f23778279d9c6bd8c558b6825d98 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--src/plugins/script/qtdbus/qtdbus.pro8
-rw-r--r--src/script/script.pro4
-rw-r--r--src/scripttools/scripttools.pro4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro
index e37bf26..1b06f27 100644
--- a/src/plugins/script/qtdbus/qtdbus.pro
+++ b/src/plugins/script/qtdbus/qtdbus.pro
@@ -1,11 +1,11 @@
TARGET = qtscriptdbus
-PLUGIN_TYPE = script
-PLUGIN_CLASS_NAME = QtDBusScriptPlugin
-load(qt_plugin)
-
QT = core gui script
CONFIG += qdbus
SOURCES += main.cpp
HEADERS += main.h
+
+PLUGIN_TYPE = script
+PLUGIN_CLASS_NAME = QtDBusScriptPlugin
+load(qt_plugin)
diff --git a/src/script/script.pro b/src/script/script.pro
index e48abac..dec4a4f 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -8,8 +8,6 @@ DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf
-load(qt_module)
-
CONFIG += building-libs
WEBKITDIR = $$PWD/../3rdparty/javascriptcore
@@ -76,3 +74,5 @@ integrity {
}
TR_EXCLUDE = $$WEBKITDIR/*
+
+load(qt_module)
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index 9b786ec..fb4343a 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -10,6 +10,6 @@ DEFINES += QT_NO_USING_NAMESPACE
QMAKE_DOCS = $$PWD/doc/qtscripttools.qdocconf
-load(qt_module)
-
include(debugging/debugging.pri)
+
+load(qt_module)