diff options
| author | axis <qt-info@nokia.com> | 2011-04-27 14:13:27 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 14:41:06 +0200 |
| commit | 40b6a270a1f3b4c0bfb2d35cb96c4f929a7802ad (patch) | |
| tree | 4b7f6d677530d690efc884dbd03a8c6518f5313d /src/imports | |
| parent | a129444bb0156c936900dbd2f12bd9f427ff366c (diff) | |
| parent | 10991179a60fae44b2446c408b16056db8b5d36d (diff) | |
Merged master into qtquick2.
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/imports/qimportbase.pri | 8 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 44764a91a2..e55a5b2a29 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -7,7 +7,7 @@ QT += declarative script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index ad872bae3f..8ebf9a02f8 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -7,7 +7,7 @@ QT += declarative SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 4627956d8c..c04e640ba6 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -103,7 +103,7 @@ OTHER_FILES += \ RESOURCES += \ spriteparticles.qrc -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 0f70030dac..8647f05cb9 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,4 +1,6 @@ -symbian:include(../plugins/qpluginbase.pri) +load(qt_module) + +symbian:include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) TEMPLATE = lib CONFIG += qt plugin @@ -13,7 +15,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir +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} @@ -25,7 +27,7 @@ QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -include(../qt_targets.pri) +include($$QT_SOURCE_TREE/src/qt_targets.pri) wince*:LIBS += $$QMAKE_LIBS_GUI |