diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2015-07-13 11:21:22 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2015-10-27 13:14:00 +0000 |
| commit | dbf1c2eb9f4e1feb24a58699b7b550016802e386 (patch) | |
| tree | b087f5b1ab6f1e224985911f93002f648021df3c /qmake/option.cpp | |
| parent | 2f83e38bfc02f790162d2a2cdcbaef668d39448d (diff) | |
QMake: Add option to set qt.conf file.
Change-Id: Ie5db11892ccf2d357773a4db6a0464bf27be9a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index da59616e5c..1d1aece626 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -172,6 +172,7 @@ bool usage(const char *a0) " -set <prop> <value> Set persistent property\n" " -unset <prop> Unset persistent property\n" " -query <prop> Query persistent property. Show all if <prop> is empty.\n" + " -qtconf file Use file instead of looking for qt.conf\n" " -cache file Use file as cache [makefile mode only]\n" " -spec spec Use spec as QMAKESPEC [makefile mode only]\n" " -nocache Don't use a cache file [makefile mode only]\n" @@ -642,6 +643,8 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) QString qmake_libraryInfoFile() { + if (!Option::globals->qtconf.isEmpty()) + return Option::globals->qtconf; if (!Option::globals->qmake_abslocation.isEmpty()) return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); return QString(); |