From 52dc1057ca71b35e220bad6a2d9417f1d4ff7813 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 2 Feb 2012 17:28:49 +1000 Subject: Install binaries and imports to qtbase. Use the Qt.quick1.* variables to determine the DESTDIR. Change-Id: I17b6d1f037b76ed25a005ec56cbc5c82b522ffc6 Reviewed-by: Matthew Vogt --- src/imports/folderlistmodel/folderlistmodel.pro | 2 +- src/imports/gestures/gestures.pro | 2 +- src/imports/particles/particles.pro | 2 +- src/imports/shaders/shaders.pro | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports') 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 -- cgit v1.2.3