From 563ce3888f3c04abcc96ba236b20c7a822bc88e2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:36:36 +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: Ic2ea6f6cae734b8094ba0617f67435f5a4fb2b14 Reviewed-by: Simon Hausmann --- src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 8 ++++---- .../qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins') 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) -- cgit v1.2.3