forked from qt-creator/qt-creator
Qt5: Fix crash in generate-ast.
Change-Id: Ib3a6662e8ba374f46a1d9bf7056bf44a704879b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
@@ -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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user