summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-05-30 10:54:28 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-05-30 15:15:37 +0000
commitbee4d0f31b190565ca75dd35c07870d92e8580c1 (patch)
tree4f20e575a4787ddd5d0f9608ab783d890d64c7ce
parent796997bda9a5553ece97352d8143aae22977e0ec (diff)
viewer: move surfaceformat stuff to after processing cmdline
...to avoid doing OpenGL stuff when just invoked --help for example. Change-Id: Ia60ef4964fda3874d0db0ef331f63d3c3a0517b8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--tools/q3dsviewer/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/q3dsviewer/main.cpp b/tools/q3dsviewer/main.cpp
index 57c1a66..ed94de4 100644
--- a/tools/q3dsviewer/main.cpp
+++ b/tools/q3dsviewer/main.cpp
@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
#else
QGuiApplication app(argc, argv);
#endif
- QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat());
QCommandLineParser cmdLineParser;
cmdLineParser.addHelpOption();
@@ -96,6 +95,8 @@ int main(int argc, char *argv[])
cmdLineParser.addOption(matteColorOption);
cmdLineParser.process(app);
+ QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat());
+
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
bool noWidgets = cmdLineParser.isSet(noMainWindowOption);
const bool fullscreen = cmdLineParser.isSet(fullScreenOption);