diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 17:41:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 17:41:48 (GMT) |
| commit | 185388c0bf0f258d070376a2a3e50b9e89e1a249 (patch) | |
| tree | 609422b6a448e3670956686442fe574335507db4 /qmake | |
| parent | 304c70a03406eb16b9a08719769655b75bf6d8e3 (diff) | |
| parent | e7b0998325a66ecb9f979f253d732db85e1f43d1 (diff) | |
| download | Qt-185388c0bf0f258d070376a2a3e50b9e89e1a249.zip Qt-185388c0bf0f258d070376a2a3e50b9e89e1a249.tar.gz Qt-185388c0bf0f258d070376a2a3e50b9e89e1a249.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem::hasFocus() performance regression.
Fix crashes in QByteArray
Move the labels a bit down so that they align better vertically with the field.
Add command to qmake to do symbian-uid generation
Fixed QBitmap::load to load into bitmap format again.
Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.
Text drawing is not fast currently
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 2ad6112..c2e033e 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -79,7 +79,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION, E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND, E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE, - E_SIZE }; + E_SIZE, E_GENERATE_UID }; QMap<QString, ExpandFunc> qmake_expandFunctions() { static QMap<QString, ExpandFunc> *qmake_expand_functions = 0; @@ -111,6 +111,7 @@ QMap<QString, ExpandFunc> qmake_expandFunctions() qmake_expand_functions->insert("prompt", E_PROMPT); qmake_expand_functions->insert("replace", E_REPLACE); qmake_expand_functions->insert("size", E_SIZE); + qmake_expand_functions->insert("generate_uid", E_GENERATE_UID); } return *qmake_expand_functions; } @@ -1864,6 +1865,9 @@ QMakeProject::doProjectExpand(QString func, QStringList args, return doProjectExpand(func, args_list, place); } +// defined in symbian generator +extern QString generate_test_uid(const QString& target); + QStringList QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, QMap<QString, QStringList> &place) @@ -2301,6 +2305,14 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, ret += QString::number(size); } break; } + case E_GENERATE_UID: + if (args.count() != 1) { + fprintf(stderr, "%s:%d: generate_uid(var) requires one argument.\n", + parser.file.toLatin1().constData(), parser.line_no); + } else { + ret += generate_test_uid(args.first()); + } + break; default: { fprintf(stderr, "%s:%d: Unknown replace function: %s\n", parser.file.toLatin1().constData(), parser.line_no, |