diff options
| author | Wolfgang Bremer <wolfgang.bremer@pelagicore.com> | 2016-04-18 13:06:41 +0200 |
|---|---|---|
| committer | Wolfgang Bremer <wolfgang.bremer@pelagicore.com> | 2016-04-29 09:08:05 +0000 |
| commit | 2f301bc45b4ae06a7678812b1a3d5ec6755b76f8 (patch) | |
| tree | 4d8a0a2cc8583b2845f1603a3050015ab1336dd1 /src/libs/qmljs/qmljslink.cpp | |
| parent | c90a356be610dd637d192220ea02f58c3f8a82ad (diff) | |
| download | qt-creator-2f301bc45b4ae06a7678812b1a3d5ec6755b76f8.tar.gz | |
CMake: Update qmljs codemodel
With this patch it is possible to specify QML_IMPORT_PATH in
CMake projects and QtCreator will scan those paths.
One only has to make sure that the variable which is set in the
CMakeLists.txt is also added to the CMakeCache.txt
Task-number: QTCREATORBUG-11328
Change-Id: I11c7694806664d3203d855983e7db4a89fac267d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index f46b228547..1d9b633370 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -437,7 +437,8 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf "For qmake projects, use the QML_IMPORT_PATH variable to add import paths.\n" "For Qbs projects, declare and set a qmlImportPaths property in your product " "to add import paths.\n" - "For qmlproject projects, use the importPaths property to add import paths.").arg( + "For qmlproject projects, use the importPaths property to add import paths.\n" + "For CMake projects, make sure QML_IMPORT_PATH variable is in CMakeCache.txt.\n").arg( importPaths.join(QLatin1Char('\n')))); } |