diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-15 17:02:15 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-16 18:01:56 +0200 |
| commit | 97c589b44677733fb2b2aa7ba521faebf3241f3b (patch) | |
| tree | b1d4b929308b739541c35fd63358199e8862fe17 /src | |
| parent | e10a5264d7ea7c9d303b50ef32b2847e2dd39452 (diff) | |
introduce Qt.quick.qmlPath property
Task-number: QBS-578
Change-Id: I116987d3232a832137781d4d5ac90adf4bd7ed88
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 1 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 6 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index b36272713..c7b1ea16d 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -180,6 +180,7 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) qtEnvironment.binaryPath = pathQueryValue(queryOutput, "QT_INSTALL_BINS"); qtEnvironment.documentationPath = pathQueryValue(queryOutput, "QT_INSTALL_DOCS"); qtEnvironment.pluginPath = pathQueryValue(queryOutput, "QT_INSTALL_PLUGINS"); + qtEnvironment.qmlPath = pathQueryValue(queryOutput, "QT_INSTALL_QML"); qtEnvironment.qmlImportPath = pathQueryValue(queryOutput, "QT_INSTALL_IMPORTS"); qtEnvironment.qtVersion = QString::fromLocal8Bit(queryOutput.value("QT_VERSION")); diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index b920d711d..d7672c9fd 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -326,6 +326,12 @@ static void createModules(Profile &profile, Settings *settings, << indent << "cpp.defines: " << "qmlDebugging ? base.concat('" + debugMacro + "') : base" << endl; + s << indent << "property string qmlPath"; + if (qtEnvironment.qmlPath.isEmpty()) + s << endl; + else + s << ": " << quotedPath(qtEnvironment.qmlPath) << endl; + s << indent << "property string qmlImportsPath: " << quotedPath(qtEnvironment.qmlImportPath); } diff --git a/src/lib/qtprofilesetup/qtprofilesetup.h b/src/lib/qtprofilesetup/qtprofilesetup.h index a2283202a..88e56d2c9 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.h +++ b/src/lib/qtprofilesetup/qtprofilesetup.h @@ -43,6 +43,7 @@ public: QString libraryPath; QString includePath; QString binaryPath; + QString qmlPath; QString qmlImportPath; QString documentationPath; QString dataPath; |