diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-25 22:54:19 +1000 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2021-09-10 14:29:41 +0000 |
| commit | 5b398d5fb5a1cc139e02fc9f2a14422c3736d062 (patch) | |
| tree | 4c39b646cd897f60f0e65083b7c44e162f9860b1 | |
| parent | 94f613155cf9f705731c6511ee85395a24d76a25 (diff) | |
Fix warnings/errors from changes to paths in chapter6-plugins example
Amends 2d2750efc3b5a97a5f1cf09b4265a26fcc393499
Change-Id: Iab27efb7359cfcea9274dcbbc7ac64b647d3e71b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 784af37650a77b30de01776262c1fe6727075615)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro | 3 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/extending-tutorial.qdoc | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro index 054ed06606..e3763b6f5e 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro @@ -5,7 +5,6 @@ QT += qml quick QML_IMPORT_NAME = Charts QML_IMPORT_MAJOR_VERSION = 1 -DESTDIR = ../$$QML_IMPORT_NAME TARGET = $$qtLibraryTarget(chartsplugin) HEADERS += piechart.h \ @@ -28,5 +27,5 @@ OTHER_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary cpqmldir.files = qmldir -cpqmldir.path = $$DESTDIR +cpqmldir.path = . COPIES += cpqmldir diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index 78ad39c403..0f031b7155 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -397,13 +397,11 @@ plugin with the Qt meta object system. Here is the \c ChartsPlugin definition in \c chartsplugin.h: -\snippet tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h 0 +\snippet tutorials/extending-qml/chapter6-plugins/Charts/chartsplugin.h 0 -Then, we write a \c .pro project file that defines the project as a plugin library -and specifies with DESTDIR that library files should be built into a \c {../Charts} -directory. +Then, we write a \c .pro project file that defines the project as a plugin library. -\quotefile tutorials/extending-qml/chapter6-plugins/import/import.pro +\quotefile tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro When building this example on Windows or Linux, the \c Charts directory will be located at the same level as the application that uses our new import module. @@ -432,7 +430,7 @@ to the same location as the plugin binary. The \c qmldir file declares the module name and the plugin that is made available by the module: -\quotefile tutorials/extending-qml/chapter6-plugins/import/qmldir +\quotefile tutorials/extending-qml/chapter6-plugins/Charts/qmldir Now we have a QML module that can be imported to any application, provided that the QML engine knows where to find it. The example contains an executable that loads |