summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2013-01-29 14:58:03 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-30 07:21:16 +0100
commitd5a6d9a4145fda39932749901d4cd4d6828ce766 (patch)
treeb3db2e97bfcdc0fbbbb8e2db5022a0c37702fc94
parent05dab891649b76fe7351d51950edf3caba2bfece (diff)
downloadqttools-d5a6d9a4145fda39932749901d4cd4d6828ce766.tar.gz
Fix crash (QFont access) by using a qt gui application.
Task-number: QTBUG-29218 Change-Id: Id7a926dce61cfac2a8c67ffaee52d305604cb34f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/assistant/qcollectiongenerator/main.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/assistant/qcollectiongenerator/main.cpp b/src/assistant/qcollectiongenerator/main.cpp
index 57857e5f9..d96fff0df 100644
--- a/src/assistant/qcollectiongenerator/main.cpp
+++ b/src/assistant/qcollectiongenerator/main.cpp
@@ -45,7 +45,6 @@
#include <private/qhelpgenerator_p.h>
#include <private/qhelpprojectdata_p.h>
-#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtCore/QMap>
#include <QtCore/QFileInfo>
@@ -57,6 +56,7 @@
#include <QtHelp/QHelpEngineCore>
#include <QtCore/QXmlStreamReader>
+#include <QtGui/QGuiApplication>
QT_USE_NAMESPACE
@@ -362,7 +362,10 @@ int main(int argc, char *argv[])
bool showHelp = false;
bool showVersion = false;
- QCoreApplication app(argc, argv);
+ // don't require a window manager even though we're a QGuiApplication
+ qputenv("QT_QPA_PLATFORM", QByteArrayLiteral("minimal"));
+ QGuiApplication app(argc, argv);
+
#ifndef Q_OS_WIN32
QTranslator translator;
QTranslator qtTranslator;