From 497978e6c2d7602448ca6fd8dd8da32813c6705b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 Oct 2012 15:44:04 +0200 Subject: make use of qml1_plugin.prf Change-Id: I0d0147592e981ef5c6543d50aa5c2cb355268553 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- src/imports/folderlistmodel/folderlistmodel.pro | 10 ++------- src/imports/gestures/gestures.pro | 10 ++------- src/imports/particles/particles.pro | 10 ++------- src/imports/qimportbase.pri | 30 ------------------------- src/imports/shaders/shaders.pro | 10 ++------- src/imports/webview/webview.pro | 10 ++------- src/qt_targets.pri | 4 ---- 7 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 src/imports/qimportbase.pri delete mode 100644 src/qt_targets.pri diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index f7fe4f3c..51b588cf 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,6 +1,6 @@ +CXX_MODULE = declarative TARGET = qmlfolderlistmodelplugin TARGETPATH = Qt/labs/folderlistmodel -include(../qimportbase.pri) QT += widgets declarative script @@ -9,10 +9,4 @@ HEADERS += qdeclarativefolderlistmodel.h OTHER_FILES += folderlistmodel.json -DESTDIR = $$QT.declarative.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml1_plugin) diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index e4ab655e..a0d19082 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -1,6 +1,6 @@ +CXX_MODULE = declarative TARGET = qmlgesturesplugin TARGETPATH = Qt/labs/gestures -include(../qimportbase.pri) QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private @@ -9,10 +9,4 @@ HEADERS += qdeclarativegesturearea_p.h OTHER_FILES += gestures.json -DESTDIR = $$QT.declarative.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml1_plugin) diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 67a3984f..6ece2c04 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,6 +1,6 @@ +CXX_MODULE = declarative TARGET = qmlparticlesplugin TARGETPATH = Qt/labs/particles -include(../qimportbase.pri) QT += declarative declarative-private core-private gui-private widgets-private @@ -13,10 +13,4 @@ HEADERS += \ OTHER_FILES += particles.json -DESTDIR = $$QT.declarative.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml1_plugin) diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri deleted file mode 100644 index b1ecbea4..00000000 --- a/src/imports/qimportbase.pri +++ /dev/null @@ -1,30 +0,0 @@ -TEMPLATE = lib -CONFIG += qt plugin - -win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release - -isEmpty(TARGETPATH) { - error("qimportbase.pri: You must provide a TARGETPATH!") -} -isEmpty(TARGET) { - error("qimportbase.pri: You must provide a TARGET!") -} - -QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir -copy2build.input = QMLDIRFILE -copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir -!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS -copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build.name = COPY ${QMAKE_FILE_IN} -copy2build.CONFIG += no_link -# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir -copy2build.CONFIG += no_clean -QMAKE_EXTRA_COMPILERS += copy2build - -TARGET = $$qtLibraryTarget($$TARGET) -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - -include(../qt_targets.pri) - -wince*:LIBS += $$QMAKE_LIBS_GUI - diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index 64d965c7..efe5f24b 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -1,6 +1,6 @@ +CXX_MODULE = declarative TARGET = qmlshadersplugin TARGETPATH = Qt/labs/shaders -include(../qimportbase.pri) QT += declarative widgets opengl @@ -23,10 +23,4 @@ HEADERS += \ OTHER_FILES += shaders.json -DESTDIR = $$QT.declarative.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml1_plugin) diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index 373163a3..8edf9c69 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -1,6 +1,6 @@ +CXX_MODULE = declarative TARGET = qmlwebkitplugin TARGETPATH = QtWebKit -include(../qimportbase.pri) QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkitwidgets @@ -9,10 +9,4 @@ HEADERS += qdeclarativewebview_p.h OTHER_FILES += plugin.json -DESTDIR = $$QT.declarative.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml1_plugin) diff --git a/src/qt_targets.pri b/src/qt_targets.pri deleted file mode 100644 index c23d63fc..00000000 --- a/src/qt_targets.pri +++ /dev/null @@ -1,4 +0,0 @@ -QMAKE_TARGET_COMPANY = Nokia Corporation and/or its subsidiary(-ies) -QMAKE_TARGET_PRODUCT = Qt5 -QMAKE_TARGET_DESCRIPTION = C++ application development framework. -QMAKE_TARGET_COPYRIGHT = Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -- cgit v1.2.3