diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-06-20 01:26:48 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-12-02 12:20:32 +0000 |
| commit | ec5a886d4b92a18669d5bbd01b43a57f7d81b856 (patch) | |
| tree | 688305c899ce01c73b8a3cf94d825f4fddc5642a /src/qml/doc | |
| parent | c3a818d19e34e08e0759dedce18d9daa5ba7d94e (diff) | |
Utilize the resources when building statically.
This is needed so that the qmldir file is picked up correctly when using a
static build of the plugins in the application as this gets taken care of
automatically by qmake. The Q_INIT_RESOURCES line itself is only needed
statically because no resource file is needed for dynamic libraries so it
is protected with the QT_STATIC define.
Task-number: QTBUG-35754
Change-Id: I9059e10c0846548f365fe4f95dd9c6100eeb43cd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/imports.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc index 9eb792bd2e..71db34695c 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc @@ -291,6 +291,7 @@ default locations to be searched by the engine. By default, this list contains: \li The directory of the current file \li The location specified by QLibraryInfo::Qml2ImportsPath \li Paths specified by the \c QML2_IMPORT_PATH environment variable +\li The qrc:/qt-project.org/imports path inside the resources. \endlist Additional import paths can be added through QQmlEngine::addImportPath() or the |