diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-24 16:44:53 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-24 16:45:34 (GMT) |
| commit | 36af8113fc9b98c90c8fd0afd7a76f3bc23dc23b (patch) | |
| tree | 1603e29ce35ff782671a038c9f16b6df05bdb03a | |
| parent | accfcb570345e9f8cf5497a2fdf4b01735c9955b (diff) | |
| download | Qt-36af8113fc9b98c90c8fd0afd7a76f3bc23dc23b.zip Qt-36af8113fc9b98c90c8fd0afd7a76f3bc23dc23b.tar.gz Qt-36af8113fc9b98c90c8fd0afd7a76f3bc23dc23b.tar.bz2 | |
Install the QML extensions.
| -rw-r--r-- | imports/Qt/multimedia/qmldir | 1 | ||||
| -rw-r--r-- | imports/Qt/widgets/qmldir | 1 | ||||
| -rw-r--r-- | src/plugins/qdeclarativemodules/multimedia/multimedia.pro | 10 | ||||
| -rw-r--r-- | src/plugins/qdeclarativemodules/widgets/widgets.pro | 9 |
4 files changed, 16 insertions, 5 deletions
diff --git a/imports/Qt/multimedia/qmldir b/imports/Qt/multimedia/qmldir new file mode 100644 index 0000000..0e6f656 --- /dev/null +++ b/imports/Qt/multimedia/qmldir @@ -0,0 +1 @@ +plugin multimedia diff --git a/imports/Qt/widgets/qmldir b/imports/Qt/widgets/qmldir new file mode 100644 index 0000000..6f19878 --- /dev/null +++ b/imports/Qt/widgets/qmldir @@ -0,0 +1 @@ +plugin widgets diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro index 21382c5..d8ad18e 100644 --- a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro +++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro @@ -5,7 +5,11 @@ QT += multimedia declarative SOURCES += multimedia.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules -target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules -INSTALLS += target +QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia +target.path = $$[QT_INSTALL_IMPORTS]/Qt/multimedia + +qmldir.files += $$QT_BUILD_TREE/imports/Qt/multimedia/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/Qt/multimedia + +INSTALLS += target qmldir diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.pro b/src/plugins/qdeclarativemodules/widgets/widgets.pro index 03c4bf1..3ec38da 100644 --- a/src/plugins/qdeclarativemodules/widgets/widgets.pro +++ b/src/plugins/qdeclarativemodules/widgets/widgets.pro @@ -11,5 +11,10 @@ HEADERS += \ graphicswidgets_p.h \ graphicslayouts_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules -target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules +QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/widgets +target.path = $$[QT_INSTALL_IMPORTS]/Qt/widgets + +qmldir.files += $$QT_BUILD_TREE/imports/Qt/widgets/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/Qt/widgets + +INSTALLS += target qmldir |