diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-09 12:47:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:37:49 +0200 |
| commit | d8b2998daeab9bfb7bfb5182960ec09b94885b17 (patch) | |
| tree | 71dd697bcb8b5b03b4509c41bdf83a3060d56c90 /qmake/property.cpp | |
| parent | 28f193ab5368bf647d7169abefd2d34af537e18d (diff) | |
Revert "move finding the makespec to Option"
Needed for an upcoming revert.
This reverts commit 74a6669fa7c0d6e2cb7d34d56332d620d2a07755.
Conflicts:
qmake/option.cpp
qmake/project.cpp
qmake/property.cpp
Change-Id: I56088506d27bf1f095f9261c75224f4bee17ec60
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/property.cpp')
| -rw-r--r-- | qmake/property.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp index 1952b5069b..076c45fc3c 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +QStringList qmake_mkspec_paths(); //project.cpp + static const struct { const char *name; QLibraryInfo::LibraryLocation loc; @@ -115,7 +117,7 @@ QMakeProperty::value(QString v, bool just_check) if (!val.isNull()) return val; else if(v == "QMAKE_MKSPECS") - return Option::mkspecPaths().join(Option::dirlist_sep); + return qmake_mkspec_paths().join(Option::dirlist_sep); else if(v == "QMAKE_VERSION") return qmake_version(); #ifdef QT_VERSION_STR |