diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2015-01-06 16:31:27 +0100 |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2015-01-08 17:52:21 +0100 |
| commit | 4ecb913768ff0806c6efdff4567ef5907f597e4a (patch) | |
| tree | 171f8ef23f66854a77279c5420cd78c665563584 /Tools/QtTestBrowser | |
| parent | a4449b1209fbcdbe936bfd692804a0be831c7b4f (diff) | |
| download | qtwebkit-4ecb913768ff0806c6efdff4567ef5907f597e4a.tar.gz | |
Fix build without OpenGL
The accelerated 2D canvas feature broke building without OpenGL due to
missing feature checks.
Task-number: QTBUG-43549
Change-Id: I7e62751d5237e1c600bc784539c70db50bccfa22
Reviewed-by: Ashish Kulkarni <kulkarni.ashish@gmail.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 8 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index e2dcef39f..d2933979b 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -177,9 +177,9 @@ void LauncherWindow::initializeView() #ifndef QT_NO_OPENGL if (!m_windowOptions.useQOpenGLWidgetViewport) toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); -#endif if (!m_windowOptions.useQGLWidgetViewport) toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport); +#endif view->setPage(page()); connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int))); @@ -407,7 +407,6 @@ void LauncherWindow::createChrome() toggleQGLWidgetViewport->setChecked(m_windowOptions.useQGLWidgetViewport); toggleQGLWidgetViewport->setEnabled(isGraphicsBased()); toggleQGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); -#endif #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) QAction* toggleQOpenGLWidgetViewport = graphicsViewMenu->addAction("Toggle use of QOpenGLWidget Viewport", this, SLOT(toggleQOpenGLWidgetViewport(bool))); toggleQOpenGLWidgetViewport->setCheckable(true); @@ -415,6 +414,7 @@ void LauncherWindow::createChrome() toggleQOpenGLWidgetViewport->setEnabled(isGraphicsBased()); toggleQOpenGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); #endif +#endif QMenu* viewportUpdateMenu = graphicsViewMenu->addMenu("Change Viewport Update Mode"); viewportUpdateMenu->setEnabled(isGraphicsBased()); @@ -802,9 +802,9 @@ void LauncherWindow::screenshot() #ifndef QT_NO_OPENGL if (!m_windowOptions.useQOpenGLWidgetViewport) toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); -#endif if (!m_windowOptions.useQGLWidgetViewport) toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport); +#endif } void LauncherWindow::setEditable(bool on) @@ -997,7 +997,6 @@ void LauncherWindow::toggleQGLWidgetViewport(bool enable) WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view); view->setViewport(enable ? new QGLWidget() : 0); } -#endif void LauncherWindow::toggleQOpenGLWidgetViewport(bool enable) { @@ -1013,6 +1012,7 @@ void LauncherWindow::toggleQOpenGLWidgetViewport(bool enable) view->setViewport(enable ? new QOpenGLWidget() : 0); #endif } +#endif void LauncherWindow::changeViewportUpdateMode(int mode) { diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index c470a5adc..5cee7e5c7 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -180,8 +180,8 @@ protected Q_SLOTS: #endif #ifndef QT_NO_OPENGL void toggleQGLWidgetViewport(bool enable); -#endif void toggleQOpenGLWidgetViewport(bool enable); +#endif void changeViewportUpdateMode(int mode); void animatedFlip(); |