diff options
| -rw-r--r-- | examples/qml/qml.pro | 1 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro | 4 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc (renamed from examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc) | 0 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro | 3 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro | 2 | ||||
| -rw-r--r-- | examples/qml/tutorials/tutorials.pro | 3 | ||||
| -rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | 4 | ||||
| -rw-r--r-- | examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro | 1 |
8 files changed, 15 insertions, 3 deletions
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index d5f9fa8a9e..eb4c98e5c4 100644 --- a/examples/qml/qml.pro +++ b/examples/qml/qml.pro @@ -7,6 +7,7 @@ qtHaveModule(quick): SUBDIRS += \ SUBDIRS += \ referenceexamples \ + tutorials \ shell EXAMPLE_FILES = \ diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro index 0c31592eeb..1ae83f71eb 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro @@ -4,9 +4,9 @@ HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp -RESOURCES += chapter3-binding.qrc +RESOURCES += chapter3-bindings.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter3-binding +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter3-bindings target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro index 4d0e807417..b340981e42 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro @@ -13,3 +13,6 @@ osx { SOURCES += main.cpp RESOURCES += app.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter6-plugins +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro index 43bf976f09..5cf4621420 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro @@ -20,6 +20,8 @@ qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += target qmldir +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary diff --git a/examples/qml/tutorials/tutorials.pro b/examples/qml/tutorials/tutorials.pro new file mode 100644 index 0000000000..265b3b69cc --- /dev/null +++ b/examples/qml/tutorials/tutorials.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +qtHaveModule(quick): SUBDIRS += \ + extending-qml diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro index daac0e29eb..8f8f4549aa 100644 --- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro @@ -18,9 +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 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 |