diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 12:15:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 12:44:43 +0100 |
| commit | 3146dcbdc768c90a03b58eed3f42630604443093 (patch) | |
| tree | 10e234460c5f57012b346cdbe6304002ad0a446d /examples/declarative/cppextensions/plugins/plugins.pro | |
| parent | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (diff) | |
| parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) | |
Merge branch 'stable' into dev
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
Diffstat (limited to 'examples/declarative/cppextensions/plugins/plugins.pro')
| -rw-r--r-- | examples/declarative/cppextensions/plugins/plugins.pro | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 053e6c44..476a58e6 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += widgets declarative DESTDIR = com/nokia/TimeExample @@ -7,7 +7,7 @@ TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp -OTHER_FILES += "plugin.json" +target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample qdeclarativesources.files += \ com/nokia/TimeExample/qmldir \ @@ -16,12 +16,10 @@ qdeclarativesources.files += \ com/nokia/TimeExample/Clock.qml \ com/nokia/TimeExample/hour.png \ com/nokia/TimeExample/minute.png +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample +qml.files += plugins.qml +qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins -sources.files += plugins.pro plugin.cpp plugins.qml README -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample - -INSTALLS += qdeclarativesources sources target +INSTALLS += target qdeclarativesources qml |