diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-09 18:52:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 23:44:55 +0200 |
| commit | 848ac33a7e4627a2944e3a74c3c652e6558af7df (patch) | |
| tree | 60316aa45e5e2198fbc55bde43a133e48b758564 | |
| parent | d520dca7351b0c1250ebfe624a958eef16df7949 (diff) | |
use centralized qml plugin project handling
Change-Id: Ic76330ac0ed10216412649b9abc7de73a730e2f0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | src/imports/feedback/feedback.pro | 15 | ||||
| -rw-r--r-- | src/imports/feedback/qfeedbackimport.pri | 41 |
2 files changed, 2 insertions, 54 deletions
diff --git a/src/imports/feedback/feedback.pro b/src/imports/feedback/feedback.pro index 441b84e..57e96db 100644 --- a/src/imports/feedback/feedback.pro +++ b/src/imports/feedback/feedback.pro @@ -1,16 +1,3 @@ -TARGET = declarative_feedback -TARGETPATH = QtFeedback -include(qfeedbackimport.pri) -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -DESTDIR = $$QT.feedback.imports/$$TARGETPATH -INSTALLS += target - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -pluginTypes.files += $$PWD/plugins.qmltypes -pluginTypes.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -INSTALLS += qmldir pluginTypes - QT += qml feedback HEADERS += qdeclarativehapticseffect_p.h \ @@ -25,3 +12,5 @@ SOURCES += qdeclarativehapticseffect.cpp \ qdeclarativethemeeffect.cpp \ qdeclarativefeedbackactuator.cpp \ qdeclarativefeedbackeffect.cpp + +load(qml_plugin) diff --git a/src/imports/feedback/qfeedbackimport.pri b/src/imports/feedback/qfeedbackimport.pri deleted file mode 100644 index edaa8d4..0000000 --- a/src/imports/feedback/qfeedbackimport.pri +++ /dev/null @@ -1,41 +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.feedback.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 - -QMLTYPEFILE = $${_PRO_FILE_PWD_}/plugins.qmltypes -copyqmltypes2build.input = QMLTYPEFILE -copyqmltypes2build.output = $$QT.feedback.imports/$$TARGETPATH/plugins.qmltypes -!contains(TEMPLATE_PREFIX, vc):copyqmltypes2build.variable_out = PRE_TARGETDEPS -copyqmltypes2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copyqmltypes2build.name = COPY ${QMAKE_FILE_IN} -copyqmltypes2build.CONFIG += no_link -# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir -copyqmltypes2build.CONFIG += no_clean - -QMAKE_EXTRA_COMPILERS += copy2build copyqmltypes2build - -TARGET = $$qtLibraryTarget($$TARGET) -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - -load(qt_targets) |