diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/opengl | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/2dpainting/2dpainting.pro | 3 | ||||
-rw-r--r-- | examples/opengl/cube/cube.pro | 3 | ||||
-rw-r--r-- | examples/opengl/framebufferobject2/framebufferobject2.pro | 4 | ||||
-rw-r--r-- | examples/opengl/grabber/grabber.pro | 4 | ||||
-rw-r--r-- | examples/opengl/hellogl/hellogl.pro | 4 | ||||
-rw-r--r-- | examples/opengl/hellogl_es2/glwidget.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/hellogl_es2/hellogl_es2.pro | 2 | ||||
-rw-r--r-- | examples/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | examples/opengl/overpainting/overpainting.pro | 4 | ||||
-rw-r--r-- | examples/opengl/pbuffers/pbuffers.pro | 4 | ||||
-rw-r--r-- | examples/opengl/pbuffers2/pbuffers2.pro | 4 | ||||
-rw-r--r-- | examples/opengl/samplebuffers/samplebuffers.pro | 4 | ||||
-rw-r--r-- | examples/opengl/textures/textures.pro | 3 |
13 files changed, 0 insertions, 43 deletions
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro index 5d361bc1bf..d481289451 100644 --- a/examples/opengl/2dpainting/2dpainting.pro +++ b/examples/opengl/2dpainting/2dpainting.pro @@ -16,8 +16,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/2dpainting INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro index 652812b718..ef6f526067 100644 --- a/examples/opengl/cube/cube.pro +++ b/examples/opengl/cube/cube.pro @@ -33,8 +33,5 @@ contains(QT_CONFIG, opengl) { message(OpenGL support is not available.) } -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro index d3fce133fa..f835e88a68 100644 --- a/examples/opengl/framebufferobject2/framebufferobject2.pro +++ b/examples/opengl/framebufferobject2/framebufferobject2.pro @@ -10,9 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/framebufferobject2 INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro index 6a73201cd2..6eebfdb738 100644 --- a/examples/opengl/grabber/grabber.pro +++ b/examples/opengl/grabber/grabber.pro @@ -11,9 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/grabber INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro index 82372c5d98..7b61ef4b3b 100644 --- a/examples/opengl/hellogl/hellogl.pro +++ b/examples/opengl/hellogl/hellogl.pro @@ -16,9 +16,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp index 90c322bdec..9cb14b20d5 100644 --- a/examples/opengl/hellogl_es2/glwidget.cpp +++ b/examples/opengl/hellogl_es2/glwidget.cpp @@ -57,9 +57,7 @@ GLWidget::GLWidget(QWidget *parent) setAttribute(Qt::WA_NoSystemBackground); setAutoBufferSwap(false); m_showBubbles = true; -#ifndef Q_WS_QWS setMinimumSize(300, 250); -#endif } GLWidget::~GLWidget() diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro index 2eef986ed2..d5bc7ba0a5 100644 --- a/examples/opengl/hellogl_es2/hellogl_es2.pro +++ b/examples/opengl/hellogl_es2/hellogl_es2.pro @@ -25,7 +25,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2 INSTALLS += target sources -symbian: CONFIG += qt_example maemo5 { # Debian package name may not contain numbers or special characters @@ -34,5 +33,4 @@ maemo5 { CONFIG += qt_example } -symbian: warning(This example might not fully work on Symbian platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 5502ee270a..a5d5dbcfaf 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -33,6 +33,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro index 1584c3c3d4..926024ad5b 100644 --- a/examples/opengl/overpainting/overpainting.pro +++ b/examples/opengl/overpainting/overpainting.pro @@ -21,9 +21,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/overpainting INSTALLS += target \ sources -symbian:CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro index 3264be3cef..431ad7a241 100644 --- a/examples/opengl/pbuffers/pbuffers.pro +++ b/examples/opengl/pbuffers/pbuffers.pro @@ -17,9 +17,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers INSTALLS += target \ sources -symbian:CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro index 9b30d793b8..bc3b7bb692 100644 --- a/examples/opengl/pbuffers2/pbuffers2.pro +++ b/examples/opengl/pbuffers2/pbuffers2.pro @@ -19,9 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2 INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro index d8f9ff1cd7..a903a0b99c 100644 --- a/examples/opengl/samplebuffers/samplebuffers.pro +++ b/examples/opengl/samplebuffers/samplebuffers.pro @@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS samplebuffers.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/samplebuffers INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro index d8941b3890..5da023fb2a 100644 --- a/examples/opengl/textures/textures.pro +++ b/examples/opengl/textures/textures.pro @@ -12,8 +12,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/textures INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) simulator: warning(This example might not fully work on Simulator platform) |