diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-09 19:11:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 11:01:02 +0100 |
| commit | aed6eaa5b211a4676c15627657f3a7bda6e3866d (patch) | |
| tree | c6cf7554155db900d4212bda7617eda34921a249 /qmake/project.cpp | |
| parent | 197ba93cf06bd57fecf9d1b2e54a778113962248 (diff) | |
QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw
this makes the "sysrootable" properties more magic, with the raw
versions being omitted from the qmake -query output and automatically
falling back to the "cooked" variant if there is no sysroot set.
this makes the "normal" qmake -query less noisy. this will become even
more obvious when i add more "overloads" of the properties.
Change-Id: I08000986427264ec6238c8fe0a77f5cecdbf1201
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 7655f05f2e..8b5ed1e2ac 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -2782,7 +2782,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString unicode != DOT && unicode != UNDERSCORE && //unicode != SINGLEQUOTE && unicode != DOUBLEQUOTE && (unicode < 'a' || unicode > 'z') && (unicode < 'A' || unicode > 'Z') && - (unicode < '0' || unicode > '9')) + (unicode < '0' || unicode > '9') && (!term || unicode != '/')) break; var.append(QChar(unicode)); if(++i == str_len) |