summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-03-30 10:10:46 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-03-30 10:10:46 (GMT)
commit3becb116bbbd9f87764cebe6813a254abc291c04 (patch)
tree4b9f067142bd5bd0313eba68d55c258d22168642 /src/imports
parenta4d208f1831ecba1d51d3afe9a9e9e21faf8b3cf (diff)
downloadQt-3becb116bbbd9f87764cebe6813a254abc291c04.zip
Qt-3becb116bbbd9f87764cebe6813a254abc291c04.tar.gz
Qt-3becb116bbbd9f87764cebe6813a254abc291c04.tar.bz2
Fix installation of qmldir files
The old pro files did not actually install the qmldir files in clean builds. These ones should work. Reviewed-by: Harald Fernengel
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/multimedia.pro2
-rw-r--r--src/imports/particles/particles.pro2
-rw-r--r--src/imports/webkit/webkit.pro2
-rw-r--r--src/imports/widgets/widgets.pro2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 8792e2b..78618fc 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -20,7 +20,7 @@ SOURCES += \
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+qmldir.files += $$PWD/qmldir
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
symbian:{
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 53d9c24..a46db8c 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -14,7 +14,7 @@ HEADERS += \
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+qmldir.files += $$PWD/qmldir
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
symbian:{
diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro
index a11f87f..7463a7f 100644
--- a/src/imports/webkit/webkit.pro
+++ b/src/imports/webkit/webkit.pro
@@ -11,7 +11,7 @@ HEADERS += qdeclarativewebview_p.h \
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+qmldir.files += $$PWD/qmldir
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
symbian:{
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
index bf2576d..cccd8b4 100644
--- a/src/imports/widgets/widgets.pro
+++ b/src/imports/widgets/widgets.pro
@@ -15,7 +15,7 @@ HEADERS += \
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+qmldir.files += $$PWD/qmldir
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
symbian:{