diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-23 16:11:50 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-24 14:00:39 +0200 |
commit | 8ae479a8eac7b9ffeeba24e9e459e3e02ca20587 (patch) | |
tree | d6fdf18ddd2456835c598f40399348d247af6c97 /examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | |
parent | 1337e0d0827e86591e67a6dbaaeb3bd3f9ed733b (diff) | |
parent | 607320ca9fb2796a5f6f2578578fd314f7e8b99e (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4runtime_p.h
src/qml/qml/qqmldelayedcallqueue.cpp
src/qml/qml/qqmlvaluetypewrapper.cpp
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/v8/qv8engine_p.h
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I3f0608c7beb88088cbbef4d0db59920f56deaea9
Diffstat (limited to 'examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro')
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | 9 |
1 files changed, 6 insertions, 3 deletions
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! |