diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-03-12 08:24:42 (GMT) |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-03-12 08:28:35 (GMT) |
| commit | 7015f7ae557f04d0ba5d6b86e521686adc5d79a1 (patch) | |
| tree | 7256238bdec055891cbc67b143d06732624222d1 | |
| parent | f74c7f2399c0e427cdc715e09c8bac4813285627 (diff) | |
| download | Qt-7015f7ae557f04d0ba5d6b86e521686adc5d79a1.zip Qt-7015f7ae557f04d0ba5d6b86e521686adc5d79a1.tar.gz Qt-7015f7ae557f04d0ba5d6b86e521686adc5d79a1.tar.bz2 | |
Fix installation of imports libraries
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 4 | ||||
| -rw-r--r-- | src/imports/webkit/webkit.pro | 4 | ||||
| -rw-r--r-- | src/imports/widgets/widgets.pro | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index f348fef..16b3ace 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -18,9 +18,9 @@ SOURCES += \ qmetadatacontrolmetaobject.cpp QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH -target.path = $$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -qmldir.files += $$QT_BUILD_TREE/imports/Qt/multimedia/qmldir +qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro index 858d3ba..ef08efe 100644 --- a/src/imports/webkit/webkit.pro +++ b/src/imports/webkit/webkit.pro @@ -9,9 +9,9 @@ HEADERS += qdeclarativewebview_p.h \ qdeclarativewebview_p_p.h QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH -target.path = $$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -qmldir.files += $$QT_BUILD_TREE/imports/org/webkit/qmldir +qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro index de22403..aa09b3c 100644 --- a/src/imports/widgets/widgets.pro +++ b/src/imports/widgets/widgets.pro @@ -13,10 +13,9 @@ HEADERS += \ graphicslayouts_p.h QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH -target.path = $$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -# install qmldir file -qmldir.files += qmldir -qmldir.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH +qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir |