diff options
6 files changed, 9 insertions, 50 deletions
diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro index 2f8009cb..3381dbec 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,17 +1,9 @@ -TEMPLATE = lib TARGET = qdeclarativeview -CONFIG += qt warn_on plugin designer QT += declarative widgets designer -DESTDIR = $$QT.designer.plugins/designer -contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) -target.path = $$[QT_INSTALL_PLUGINS]/designer -INSTALLS += target - -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} +PLUGIN_TYPE = designer +CONFIG += tool_plugin +load(qt_plugin) SOURCES += qdeclarativeview_plugin.cpp HEADERS += qdeclarativeview_plugin.h diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 46ba748b..19e6897a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,10 +1,9 @@ TARGET = qmldbg_inspector QT += declarative declarative-private gui widgets core-private +PLUGIN_TYPE = qmltooling load(qt_plugin) -DESTDIR = $$QT.declarative.plugins/qmltooling - INCLUDEPATH *= $$PWD SOURCES += \ @@ -45,6 +44,3 @@ HEADERS += \ abstracttool.h OTHER_FILES += qtquick1plugin.json - -target.path += $$[QT_INSTALL_PLUGINS]/qmltooling -INSTALLS += target 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 b6857be6..cfd2e8ec 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,9 @@ TARGET = qmldbg_tcp_qtdeclarative QT += declarative declarative-private network +PLUGIN_TYPE = qmltooling load(qt_plugin) -DESTDIR = $$QT.declarative.plugins/qmltooling - SOURCES += \ qtcpserverconnection.cpp @@ -12,6 +11,3 @@ HEADERS += \ qtcpserverconnection.h OTHER_FILES += qtcpserverconnection.json - -target.path += $$[QT_INSTALL_PLUGINS]/qmltooling -INSTALLS += target diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri deleted file mode 100644 index 51fd2c3b..00000000 --- a/src/plugins/qpluginbase.pri +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = lib -isEmpty(QT_MAJOR_VERSION) { - VERSION=4.8.0 -} else { - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} -} -CONFIG += qt plugin - -win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release -TARGET = $$qtLibraryTarget($$TARGET) -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - -include(../qt_targets.pri) - -wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/tools/designer/src/plugins/plugins.pri b/tools/designer/src/plugins/plugins.pri index f3575bcb..330a2e7f 100644 --- a/tools/designer/src/plugins/plugins.pri +++ b/tools/designer/src/plugins/plugins.pri @@ -1,8 +1,5 @@ -CONFIG += designer -win32|mac: CONFIG+= debug_and_release -DESTDIR = $$QT.designer.plugins -contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) +QT += designer declarative -# install -target.path = $$[QT_INSTALL_PLUGINS]/designer -INSTALLS += target +PLUGIN_TYPE = designer +CONFIG += tool_plugin +load(qt_plugin) diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index b8abe874..b08a568c 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,13 +1,6 @@ -TEMPLATE = lib TARGET = qdeclarativeview -CONFIG += qt warn_on plugin designer -QT += declarative include(../plugins.pri) -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} SOURCES += qdeclarativeview_plugin.cpp HEADERS += qdeclarativeview_plugin.h |