diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-09 19:08:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 23:53:03 +0200 |
commit | a355c3a54cdc1c8bfd2129307c7824dd7012bd11 (patch) | |
tree | 67a386a4ebb552a5e46539d49788fab41b5819c0 /src/imports | |
parent | 5bca65137d16bac7da4bf5e2ec87cec2a286d903 (diff) |
use centralized qml plugin project handling
Change-Id: I6afbc938a3db79f3a27b2b83d72e111e5d03ea9c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/sensors/plugins.qmltypes (renamed from src/imports/sensors/plugin.qmltypes) | 0 | ||||
-rw-r--r-- | src/imports/sensors/qmldir | 2 | ||||
-rw-r--r-- | src/imports/sensors/qsensorsimport.pri | 31 | ||||
-rw-r--r-- | src/imports/sensors/sensors.pro | 15 | ||||
-rw-r--r-- | src/imports/sensors2/plugins.qmltypes (renamed from src/imports/sensors2/plugin.qmltypes) | 0 | ||||
-rw-r--r-- | src/imports/sensors2/qmldir | 2 | ||||
-rw-r--r-- | src/imports/sensors2/qsensors2import.pri | 31 | ||||
-rw-r--r-- | src/imports/sensors2/sensors2.pro | 18 |
8 files changed, 8 insertions, 91 deletions
diff --git a/src/imports/sensors/plugin.qmltypes b/src/imports/sensors/plugins.qmltypes index fa5fd598..fa5fd598 100644 --- a/src/imports/sensors/plugin.qmltypes +++ b/src/imports/sensors/plugins.qmltypes diff --git a/src/imports/sensors/qmldir b/src/imports/sensors/qmldir index 17dc9501..8629eef1 100644 --- a/src/imports/sensors/qmldir +++ b/src/imports/sensors/qmldir @@ -1,2 +1,2 @@ plugin declarative_sensors -typeinfo plugin.qmltypes +typeinfo plugins.qmltypes diff --git a/src/imports/sensors/qsensorsimport.pri b/src/imports/sensors/qsensorsimport.pri deleted file mode 100644 index f8be980b..00000000 --- a/src/imports/sensors/qsensorsimport.pri +++ /dev/null @@ -1,31 +0,0 @@ -load(qt_module) - -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.sensors.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 - -load(qt_targets) - -wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index d470ece2..043a4357 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -1,22 +1,13 @@ +CXX_MODULE = sensors TARGET = declarative_sensors TARGETPATH = QtMobility/sensors -IMPORT_NAME = $$TARGETPATH -IMPORT_NAME~=s,/,.,g IMPORT_VERSION = 1.3 # Doesn't matter, as long as it's a valid version?! -include(qsensorsimport.pri) - QT += qml sensors SOURCES += sensors.cpp -DESTDIR = $$QT.sensors.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir $$PWD/plugin.qmltypes -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml_plugin) OTHER_FILES += \ - plugin.json qmldir plugin.qmltypes + plugin.json diff --git a/src/imports/sensors2/plugin.qmltypes b/src/imports/sensors2/plugins.qmltypes index 590bf263..590bf263 100644 --- a/src/imports/sensors2/plugin.qmltypes +++ b/src/imports/sensors2/plugins.qmltypes diff --git a/src/imports/sensors2/qmldir b/src/imports/sensors2/qmldir index 81220bb4..d2a2be1f 100644 --- a/src/imports/sensors2/qmldir +++ b/src/imports/sensors2/qmldir @@ -1,2 +1,2 @@ plugin declarative_qtsensors5 -typeinfo plugin.qmltypes +typeinfo plugins.qmltypes diff --git a/src/imports/sensors2/qsensors2import.pri b/src/imports/sensors2/qsensors2import.pri deleted file mode 100644 index f8be980b..00000000 --- a/src/imports/sensors2/qsensors2import.pri +++ /dev/null @@ -1,31 +0,0 @@ -load(qt_module) - -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.sensors.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 - -load(qt_targets) - -wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro index fb6be47e..be5060e1 100644 --- a/src/imports/sensors2/sensors2.pro +++ b/src/imports/sensors2/sensors2.pro @@ -1,10 +1,5 @@ +CXX_MODULE = sensors TARGET = declarative_qtsensors5 -TARGETPATH = QtSensors -IMPORT_NAME = $$TARGETPATH -IMPORT_NAME~=s,/,.,g -IMPORT_VERSION = 5.0 # Doesn't matter, as long as it's a valid version?! - -include(qsensors2import.pri) QT += qml sensors @@ -21,14 +16,7 @@ HEADERS += qsensor2ambientlight.h \ qsensor2gesture.h \ qsensor2common.h -DESTDIR = $$QT.sensors.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir $$PWD/plugin.qmltypes -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml_plugin) OTHER_FILES += \ - plugin.json qmldir plugin.qmltypes - + plugin.json |