diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:04:54 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 20:41:34 +0200 |
commit | 63ec33e79cf86c4312c58bea12a2aab400890c70 (patch) | |
tree | 5c9b5cd51276ea0a3ca42567666a09e70efa11cc /examples/quick | |
parent | b9e4a4df577959579b2322fb6077bde82d9ffce3 (diff) | |
parent | afc84775efdc6e13e2e210bb94e115b378d90134 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
Change-Id: I89ffccd699bee675732758d039e22224b275d60d
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/customitems/painteditem/painteditem.pro | 2 | ||||
-rw-r--r-- | examples/quick/imageprovider/imageprovider.pro | 2 | ||||
-rw-r--r-- | examples/quick/imageresponseprovider/imageresponseprovider.pro | 2 | ||||
-rw-r--r-- | examples/quick/quick-accessibility/quick-accessibility.pro | 3 | ||||
-rw-r--r-- | examples/quick/quick.pro | 1 | ||||
-rw-r--r-- | examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro | 3 | ||||
-rw-r--r-- | examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png | bin | 11287 -> 0 bytes | |||
-rw-r--r-- | examples/quick/quickwidgets/quickwidget/quickwidget.pro | 3 | ||||
-rw-r--r-- | examples/quick/scenegraph/graph/graph.pro | 8 | ||||
-rw-r--r-- | examples/quick/scenegraph/scenegraph.pro | 4 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | 9 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro | 1 | ||||
-rw-r--r-- | examples/quick/window/window.pro | 3 |
13 files changed, 31 insertions, 10 deletions
diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index 3ec6420abf..bc7480ab9e 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -19,5 +19,7 @@ qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonP INSTALLS += qmldir target +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += \ textballoons.qml diff --git a/examples/quick/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro index 5567a2d6d9..e54469b0d8 100644 --- a/examples/quick/imageprovider/imageprovider.pro +++ b/examples/quick/imageprovider/imageprovider.pro @@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore qml.files = ImageProviderCore/qmldir qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore INSTALLS = target qml + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.pro b/examples/quick/imageresponseprovider/imageresponseprovider.pro index 856ddde863..8be4dbb658 100644 --- a/examples/quick/imageresponseprovider/imageresponseprovider.pro +++ b/examples/quick/imageresponseprovider/imageresponseprovider.pro @@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseP qml.files = ImageResponseProviderCore/qmldir qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore INSTALLS = target qml + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/quick/quick-accessibility/quick-accessibility.pro b/examples/quick/quick-accessibility/quick-accessibility.pro index 70cf34b54c..cc9d48ac0f 100644 --- a/examples/quick/quick-accessibility/quick-accessibility.pro +++ b/examples/quick/quick-accessibility/quick-accessibility.pro @@ -6,3 +6,6 @@ RESOURCES += accessibility.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/quick-accessibility INSTALLS += target + +EXAMPLE_FILES += \ + accessibility.qmlproject diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index e66e24882e..63730e53da 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -16,6 +16,7 @@ SUBDIRS = quick-accessibility \ scenegraph \ shadereffects \ text \ + textureprovider \ threading \ touchinteraction \ tutorials \ diff --git a/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro b/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro index 9d70f7aa5a..80216da346 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro +++ b/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro @@ -15,3 +15,6 @@ HEADERS += mainwindow.h \ RESOURCES += qquickviewcomparison.qrc OTHER_FILES += test.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/quickwidgets/qquickviewcomparison +INSTALLS += target diff --git a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png Binary files differdeleted file mode 100644 index d9e710b7e7..0000000000 --- a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png +++ /dev/null diff --git a/examples/quick/quickwidgets/quickwidget/quickwidget.pro b/examples/quick/quickwidgets/quickwidget/quickwidget.pro index 1aca22082e..04fb5541a7 100644 --- a/examples/quick/quickwidgets/quickwidget/quickwidget.pro +++ b/examples/quick/quickwidgets/quickwidget/quickwidget.pro @@ -6,3 +6,6 @@ TEMPLATE = app SOURCES += main.cpp RESOURCES += quickwidget.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/quickwidgets/quickwidget +INSTALLS += target diff --git a/examples/quick/scenegraph/graph/graph.pro b/examples/quick/scenegraph/graph/graph.pro index 5991f799dc..1a880b61f1 100644 --- a/examples/quick/scenegraph/graph/graph.pro +++ b/examples/quick/scenegraph/graph/graph.pro @@ -1,9 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-06-11T13:13:18 -# -#------------------------------------------------- - QT += core gui quick TARGET = graph @@ -32,3 +26,5 @@ OTHER_FILES += \ shaders/line.fsh \ shaders/line.vsh +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/graph +INSTALLS += target diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 1e7e74372d..cf50cdb903 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ customgeometry \ + graph \ openglunderqml \ sgengine \ simplematerial \ @@ -8,3 +9,6 @@ SUBDIRS += \ textureinthread \ threadedanimation \ twotextureproviders + +EXAMPLE_FILES += \ + shared diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro index e88e8f670c..8f8f4549aa 100644 --- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro @@ -18,8 +18,11 @@ SOURCES += \ file.cpp \ dialogPlugin.cpp -OTHER_FILES += qmldir +EXAMPLE_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary -QMAKE_POST_LINK += $$QMAKE_COPY $$shell_quote($$shell_path($$PWD/qmldir)) \ - $$shell_quote($$shell_path($$DESTDIR)) $$escape_expand(\\n\\t) +cpqmldir.files = $$PWD/qmldir +cpqmldir.path = $$DESTDIR +COPIES += cpqmldir + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro index 1fc74b69f3..725ff3bbac 100644 --- a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro +++ b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro @@ -7,4 +7,5 @@ EXAMPLE_FILES = \ images \ parts \ pics \ + texteditor.qmlproject \ texteditor.qml diff --git a/examples/quick/window/window.pro b/examples/quick/window/window.pro index be35b24325..c3e9b080bb 100644 --- a/examples/quick/window/window.pro +++ b/examples/quick/window/window.pro @@ -6,7 +6,8 @@ RESOURCES += \ window.qrc \ ../shared/shared.qrc EXAMPLE_FILES = \ - window.qml + window.qml \ + resources target.path = $$[QT_INSTALL_EXAMPLES]/quick/window INSTALLS += target |