diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-18 16:01:48 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-20 09:53:13 +0000 |
| commit | f5345badaeefac7c03c8a26dea6b89706871c3fe (patch) | |
| tree | bc863fadf9ec8869690fa51f7e7e63ec2ad60294 /Tools/QtTestBrowser | |
| parent | 778e0c7c940f8a22f9a43290aef378fb707ca088 (diff) | |
| download | qtwebkit-f5345badaeefac7c03c8a26dea6b89706871c3fe.tar.gz | |
Import WebKit commit e89cea5f01479652674d3c24b2f387eb0987d0a1
Change-Id: Ifc00865ceeb5b83b7990f91af7dbbd1a05df1c30
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 2 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index a091c9541..ccd8e0ff2 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -55,7 +55,6 @@ if (Qt5OpenGL_FOUND) list(APPEND QtTestBrowser_LIBRARIES ${Qt5OpenGL_LIBRARIES} ) - add_definitions(-DQT_CONFIGURED_WITH_OPENGL) endif () if (ENABLE_TEST_SUPPORT) diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index 59851883e..716a6e3e8 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -168,9 +168,9 @@ void LauncherWindow::initializeView() } else { WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter); m_view = view; -#ifndef QT_NO_OPENGL if (!m_windowOptions.useQOpenGLWidgetViewport) toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); +#ifdef QT_OPENGL_LIB if (!m_windowOptions.useQGLWidgetViewport) toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport); #endif diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index 24ca97a7a..52d9066b0 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -135,7 +135,7 @@ void LauncherApplication::handleUserOptions() qDebug() << "Usage:" << programName.toLatin1().data() << "[-graphicsbased]" << "[-no-compositing]" -#if defined(QT_CONFIGURED_WITH_OPENGL) +#ifdef QT_OPENGL_LIB << "[-gl-viewport]" #endif << "[-opengl-viewport]" @@ -240,7 +240,7 @@ void LauncherApplication::handleUserOptions() windowOptions.viewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx); } -#ifdef QT_CONFIGURED_WITH_OPENGL +#ifdef QT_OPENGL_LIB if (args.contains("-gl-viewport") || defaultForAnimations) { requiresGraphicsView("-gl-viewport"); windowOptions.useQGLWidgetViewport = true; |