diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-02 17:28:49 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-03 01:17:45 +0100 |
| commit | 52dc1057ca71b35e220bad6a2d9417f1d4ff7813 (patch) | |
| tree | 6d70e90c5eaa29cf40fc084ecfcce58d599eb104 /src | |
| parent | 53e7e93630b3b21a6a05fcdeed4121a6036d0f16 (diff) | |
Install binaries and imports to qtbase.
Use the Qt.quick1.* variables to determine the DESTDIR.
Change-Id: I17b6d1f037b76ed25a005ec56cbc5c82b522ffc6
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'src')
| -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/shaders/shaders.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 5 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index fd80acd1..6f36aa38 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -7,7 +7,7 @@ QT += widgets quick1 script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.quick1.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 03dd7293..81003905 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -7,7 +7,7 @@ QT += quick1 quick1-private widgets widgets-private gui gui-private core-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.quick1.imports/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 019b63ae..2c3931cf 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -11,7 +11,7 @@ SOURCES += \ HEADERS += \ qdeclarativeparticles_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.quick1.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index 2d089528..cdb59577 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -21,7 +21,7 @@ HEADERS += \ scenegraph/qsggeometry.h \ shadereffectbuffer.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.quick1.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 629cade1..b4d7fbf3 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 += quick1 quick1-private gui widgets core-private -include(../../qpluginbase.pri) +load(qt_plugin) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, quick1)" +DESTDIR = $$QT.quick1.plugins/qmltooling SOURCES += \ qtquick1plugin.cpp \ |