diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:11 +0100 |
| commit | 27016b89ae49da091527548af0ca9022ec4d7902 (patch) | |
| tree | de408d49d52dd6a73e75a612ef51342d6ee44638 /examples/opengl/hellowindow/main.cpp | |
| parent | 3683bc97d2ebc0de3272fc09656b90a88f5eb326 (diff) | |
| parent | fbaa6d3ca6fc2693c5c8a1cd8e565803adc97730 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Idec54e19963e8d88c711cb179cffc81596323899
Diffstat (limited to 'examples/opengl/hellowindow/main.cpp')
| -rw-r--r-- | examples/opengl/hellowindow/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/opengl/hellowindow/main.cpp b/examples/opengl/hellowindow/main.cpp index d6802a8e20..5b2552ee3e 100644 --- a/examples/opengl/hellowindow/main.cpp +++ b/examples/opengl/hellowindow/main.cpp @@ -51,8 +51,9 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - const bool multipleWindows = - QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL) + QPlatformIntegration *integ = QGuiApplicationPrivate::platformIntegration(); + const bool multipleWindows = integ->hasCapability(QPlatformIntegration::ThreadedOpenGL) + && integ->hasCapability(QPlatformIntegration::WindowManagement) && !QGuiApplication::arguments().contains(QStringLiteral("--single")); QScreen *screen = QGuiApplication::primaryScreen(); |