diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-23 19:34:10 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 08:43:06 +0100 |
| commit | 74a6669fa7c0d6e2cb7d34d56332d620d2a07755 (patch) | |
| tree | 9dccf49e81b2a212822304c50b3a7976580da816 /qmake/property.cpp | |
| parent | 123eb803ef1a7af36eefdf9a668f1f29d6597f1d (diff) | |
move finding the makespec to Option
this is a one-time operation which depends only on the invocation, so
this new home is much more appropriate.
Change-Id: I07c66d95a9ae01a664cec17564995311fb78ec9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/property.cpp')
| -rw-r--r-- | qmake/property.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp index 4221605545..064c8f6082 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE -QStringList qmake_mkspec_paths(); //project.cpp - QMakeProperty::QMakeProperty() : settings(0) { } @@ -107,7 +105,7 @@ QMakeProperty::value(QString v, bool just_check) else if(v == "QT_INSTALL_DEMOS") return QLibraryInfo::location(QLibraryInfo::ExamplesPath); else if(v == "QMAKE_MKSPECS") - return qmake_mkspec_paths().join(Option::dirlist_sep); + return Option::mkspecPaths().join(Option::dirlist_sep); else if(v == "QMAKE_VERSION") return qmake_version(); #ifdef QT_VERSION_STR |