From 751c105984532f41de4c5f712f36f4c2579a60b7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:37:01 +0100 Subject: 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 --- src/plugins/script/qtdbus/qtdbus.pro | 8 ++++---- src/script/script.pro | 4 ++-- src/scripttools/scripttools.pro | 4 ++-- 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) -- cgit v1.2.1