summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-12 16:03:42 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-03-07 14:09:49 +0000
commita28364bc1c7144b9c5c383cc5d18d62a68076a38 (patch)
treea38dff17491853693369bdc9938bf0470994e5c1 /src/widgets
parent27c87e31dd07611e9505033d00547002d61ee7c3 (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: Icbce502dcbcb4d4b4d922c42679f44e2cc930bf3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/accessible/widgets.pro10
-rw-r--r--src/widgets/widgets.pro9
2 files changed, 8 insertions, 11 deletions
diff --git a/src/widgets/accessible/widgets.pro b/src/widgets/accessible/widgets.pro
index c6af6d3f71..da8607c637 100644
--- a/src/widgets/accessible/widgets.pro
+++ b/src/widgets/accessible/widgets.pro
@@ -1,10 +1,5 @@
TARGET = qtaccessiblewidgets
-PLUGIN_TYPE = accessible
-PLUGIN_EXTENDS = widgets
-PLUGIN_CLASS_NAME = AccessibleFactory
-load(qt_plugin)
-
QT += core-private gui-private widgets-private
QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
@@ -24,4 +19,7 @@ HEADERS += qaccessiblewidgets.h \
qaccessiblemenu.h \
itemviews.h
-
+PLUGIN_TYPE = accessible
+PLUGIN_EXTENDS = widgets
+PLUGIN_CLASS_NAME = AccessibleFactory
+load(qt_plugin)
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index ceb6f96f7c..b609e4c434 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -8,13 +8,8 @@ DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
-MODULE_PLUGIN_TYPES += \
- styles
-
QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf
-load(qt_module)
-
#platforms
mac:include(kernel/mac.pri)
win32:include(kernel/win.pri)
@@ -45,3 +40,7 @@ QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtWidgets.dynlist
testcocoon {
load(testcocoon)
}
+
+MODULE_PLUGIN_TYPES += \
+ styles
+load(qt_module)