diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-05-30 15:10:46 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-05-30 12:24:41 +0000 |
| commit | 070eb2b5cd84b703fc4d296d00dce560efc55131 (patch) | |
| tree | 8851e131e69e72868214e8a2d926233d69ef9a53 /standalone | |
| parent | e29b4fb7f5c2a7b13476c2c477a24c080957edd0 (diff) | |
Use QApplication again with standalone application
Introducing creator plugin caused standalone app menu style to change,
because QGuiApplication was used instead of QApplication.
The menu icons were also not working with the new style.
When launching via creator, the menus are on the old style, as
creator is based on QApplication, so revert the standalone to same
style.
Change-Id: I8b169f04e38dcfc1f16b39730aa033e96b38b87b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/main.cpp | 4 | ||||
| -rw-r--r-- | standalone/standalone.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/standalone/main.cpp b/standalone/main.cpp index 4407fe9..8ac802b 100644 --- a/standalone/main.cpp +++ b/standalone/main.cpp @@ -25,13 +25,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QGuiApplication> +#include <QtWidgets/QApplication> #include <QQmlApplicationEngine> #include "../editorlib/src/qt3dsceneeditor.h" int main(int argc, char *argv[]) { - QGuiApplication app(argc, argv); + QApplication app(argc, argv); register3DSceneEditorQML(); diff --git a/standalone/standalone.pro b/standalone/standalone.pro index 868db70..3c71cba 100644 --- a/standalone/standalone.pro +++ b/standalone/standalone.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick +QT += qml quick widgets DEPENDPATH += ../editorlib INCLUDEPATH += ../editorlib |