diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2012-10-24 16:17:00 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2012-11-05 10:57:23 +0100 |
| commit | cd7a41ca908cda4cb22e0c239779c35d47cd7b7d (patch) | |
| tree | fb1cf0a866f47090fe02cc2fe5886c03fc54cf92 | |
| parent | 339164746c197e01a5acee0623ffbbabc5e25e34 (diff) | |
| download | qt-creator-cd7a41ca908cda4cb22e0c239779c35d47cd7b7d.tar.gz | |
Qt5: Fix crash in generate-ast.
Change-Id: Ib3a6662e8ba374f46a1d9bf7056bf44a704879b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/tools/gen-cpp-ast/generate-ast.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/tools/gen-cpp-ast/generate-ast.cpp b/src/tools/gen-cpp-ast/generate-ast.cpp index 56c6f61c56..34d83b7326 100644 --- a/src/tools/gen-cpp-ast/generate-ast.cpp +++ b/src/tools/gen-cpp-ast/generate-ast.cpp @@ -27,7 +27,6 @@ ** ****************************************************************************/ -#include <QCoreApplication> #include <QStringList> #include <QTextDocument> #include <QTextCursor> @@ -35,6 +34,15 @@ #include <QDir> #include <QDebug> +#if QT_VERSION >= 0x050000 + // Qt5: QTextDocument needs access to Fonts via QGuiApplication. + #include <QGuiApplication> + typedef QGuiApplication MyQApplication; +#else + #include <QCoreApplication> + typedef QCoreApplication MyQApplication; +#endif + #include <Control.h> #include <Parser.h> #include <AST.h> @@ -1660,7 +1668,8 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) int main(int argc, char *argv[]) { - QCoreApplication app(argc, argv); + MyQApplication app(argc, argv); + QStringList files = app.arguments(); files.removeFirst(); |