diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-03 15:00:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-03 15:00:29 (GMT) |
| commit | 14e4fd08ff67578dccf5e85a88fcadf747ae5852 (patch) | |
| tree | 903518cf3f79926a52ebe1f0a7e55d5ab26382a6 /qmake/project.cpp | |
| parent | 2242f508903983b5aac3c086f1f652ec04c53e4c (diff) | |
| parent | b552f7c8b5cdc455b87a2688ac0df47fcdf7ac35 (diff) | |
| download | Qt-14e4fd08ff67578dccf5e85a88fcadf747ae5852.zip Qt-14e4fd08ff67578dccf5e85a88fcadf747ae5852.tar.gz Qt-14e4fd08ff67578dccf5e85a88fcadf747ae5852.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
rebuild configure
fix misleading uppercasing deprecation warning
Enable Phonon on Symbian by default.
Disable OpenGL on Symbian only by default instead of always
VFP type on ARM option in Linux configure script
Adding -dont-process option to Unix configure script
Synchronized configure.exe OpenGL options with Unix configure
build lrelease as part of the "libs" part.
purge vestiges of imageformat-plugins
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 2586c57..d967a63 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1813,11 +1813,10 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, for(int i = 0; i < args_list.size(); ++i) args += args_list[i].join(QString(Option::field_sep)); - QString lfunc = func.toLower(); - if (!lfunc.isSharedWith(func)) + ExpandFunc func_t = qmake_expandFunctions().value(func); + if (!func_t && (func_t = qmake_expandFunctions().value(func.toLower()))) warn_msg(WarnDeprecated, "%s:%d: Using uppercased builtin functions is deprecated.", parser.file.toLatin1().constData(), parser.line_no); - ExpandFunc func_t = qmake_expandFunctions().value(lfunc); debug_msg(1, "Running project expand: %s(%s) [%d]", func.toLatin1().constData(), args.join("::").toLatin1().constData(), func_t); |