diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 13:42:11 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 13:42:11 +0100 |
| commit | 5e8ae03578ecd0538a774505f2f7e2fc626b0ab7 (patch) | |
| tree | 3b6f704df4d55d0ed2a5a706acf785541a74a45e /examples | |
| parent | 7a5fea113ec6088135b0b6a0fc4297e0ef362bc5 (diff) | |
| parent | be3fb9afe50361e4b35d02d28ef30851335b17b6 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/kernel/qtimerinfo_unix.cpp
src/plugins/platforms/cocoa/qcocoabackingstore.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/windows/qwindowswindow.cpp
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gui/gui.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/graphicsview/chip/view.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/graphicsview/padnavigator/padnavigator.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index 1a4067e893..8758a1ba95 100644 --- a/examples/gui/gui.pro +++ b/examples/gui/gui.pro @@ -3,4 +3,6 @@ CONFIG += no_docs_target SUBDIRS += analogclock SUBDIRS += rasterwindow -SUBDIRS += openglwindow +contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += openglwindow +} diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp index c80c8be66c..a439c837de 100644 --- a/examples/widgets/graphicsview/chip/view.cpp +++ b/examples/widgets/graphicsview/chip/view.cpp @@ -47,6 +47,8 @@ #endif #ifndef QT_NO_OPENGL #include <QtOpenGL> +#else +#include <QtWidgets> #endif #include <qmath.h> diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp index e92f156ad6..82671578fb 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp @@ -44,6 +44,8 @@ #ifndef QT_NO_OPENGL #include <QtOpenGL> +#else +#include <QtWidgets> #endif //! [0] |