summaryrefslogtreecommitdiff
path: root/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2014-08-28 17:44:24 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-08-28 18:49:57 +0200
commiteedd47657f864fe20929c8bac6b346c75486c2ac (patch)
tree61b22fbb1ff846fb4f3e1293e32b958730019d49 /src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
parent42038ca35a86b1582d1813282a3d302e9fe58964 (diff)
downloadqt-creator-eedd47657f864fe20929c8bac6b346c75486c2ac.tar.gz
Cpp{Editor,Tools}: Remove some Qt4-only code
Change-Id: I94ca7b239e974b6b400933466ee2ef5ae4def336 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp')
-rw-r--r--src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
index a0d9fd3f0c..16ca17504e 100644
--- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
+++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
@@ -27,21 +27,13 @@
**
****************************************************************************/
+#include <QDebug>
+#include <QDir>
+#include <QGuiApplication>
#include <QStringList>
-#include <QTextDocument>
-#include <QTextCursor>
#include <QTextBlock>
-#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 <QTextCursor>
+#include <QTextDocument>
#include <cplusplus/Control.h>
#include <cplusplus/Parser.h>
@@ -1720,7 +1712,7 @@ void printUsage()
int main(int argc, char *argv[])
{
- MyQApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
QStringList args = app.arguments();
args.removeFirst();