summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/multimedia.pro4
-rw-r--r--src/imports/qimportbase.pri2
-rw-r--r--src/imports/webkit/webkit.pro4
-rw-r--r--src/imports/widgets/widgets.pro4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 117aa9b..f7a1d1b 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -1,5 +1,5 @@
TARGET = multimedia
-TARGETPATH = $$[QT_INSTALL_IMPORTS]/Qt/multimedia
+TARGETPATH = Qt/multimedia
include(../qimportbase.pri)
QT += multimedia declarative
@@ -21,6 +21,6 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia
target.path = $$TARGETPATH
qmldir.files += $$QT_BUILD_TREE/imports/Qt/multimedia/qmldir
-qmldir.path += $$TARGETPATH
+qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
INSTALLS += target qmldir
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri
index 363dd88..5433059 100644
--- a/src/imports/qimportbase.pri
+++ b/src/imports/qimportbase.pri
@@ -12,7 +12,7 @@ isEmpty(TARGET) {
QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
copy2build.input = QMLDIRFILE
-copy2build.output = $$TARGETPATH/qmldir
+copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}
diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro
index 76b46f1..fdc12cc 100644
--- a/src/imports/webkit/webkit.pro
+++ b/src/imports/webkit/webkit.pro
@@ -1,5 +1,5 @@
TARGET = webkitqmlplugin
-TARGETPATH = $$[QT_INSTALL_IMPORTS]/org/webkit
+TARGETPATH = org/webkit
include(../qimportbase.pri)
QT += webkit declarative
@@ -14,6 +14,6 @@ QTDIR_build:DESTDIR = $$TARGETPATH
target.path = $$TARGETPATH
qmldir.files += $$QT_BUILD_TREE/imports/org/webkit/qmldir
-qmldir.path += $$TARGETPATH
+qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
INSTALLS += target qmldir
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
index b98be59..02223d7 100644
--- a/src/imports/widgets/widgets.pro
+++ b/src/imports/widgets/widgets.pro
@@ -1,5 +1,5 @@
TARGET = widgets
-TARGETPATH = $$[QT_INSTALL_IMPORTS]/Qt/widgets
+TARGETPATH = Qt/widgets
include(../qimportbase.pri)
QT += declarative
@@ -17,6 +17,6 @@ target.path = $$TARGETPATH
# install qmldir file
qmldir.files += qmldir
-qmldir.path = $$TARGETPATH
+qmldir.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
INSTALLS += target qmldir