diff options
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/2dpainting/2dpainting.pro | 4 | ||||
-rw-r--r-- | examples/opengl/cube/cube.pro | 8 | ||||
-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_es/hellogl_es.pro | 4 | ||||
-rw-r--r-- | examples/opengl/hellogl_es2/hellogl_es2.pro | 4 | ||||
-rw-r--r-- | examples/opengl/hellowindow/hellowindow.pro | 4 | ||||
-rw-r--r-- | examples/opengl/opengl.pro | 6 | ||||
-rw-r--r-- | examples/opengl/overpainting/overpainting.pro | 10 | ||||
-rw-r--r-- | examples/opengl/paintedwindow/paintedwindow.pro | 4 | ||||
-rw-r--r-- | examples/opengl/pbuffers/pbuffers.pro | 10 | ||||
-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 | 4 |
15 files changed, 15 insertions, 63 deletions
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro index 0c981ce505..54e9a11f1e 100644 --- a/examples/opengl/2dpainting/2dpainting.pro +++ b/examples/opengl/2dpainting/2dpainting.pro @@ -12,9 +12,7 @@ SOURCES = glwidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting -INSTALLS += target sources +INSTALLS += target 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 c904160d90..aaa933c1e2 100644 --- a/examples/opengl/cube/cube.pro +++ b/examples/opengl/cube/cube.pro @@ -18,16 +18,10 @@ contains(QT_CONFIG, opengl) { RESOURCES += \ shaders.qrc \ textures.qrc - - OTHER_FILES += \ - vshader.glsl \ - fshader.glsl } # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/cube -sources.files = $$SOURCES $$HEADERS $$RESOURCES cube.png *.glsl *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/cube -INSTALLS += target sources +INSTALLS += target 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 073981b9f9..d26751ab0e 100644 --- a/examples/opengl/framebufferobject2/framebufferobject2.pro +++ b/examples/opengl/framebufferobject2/framebufferobject2.pro @@ -6,9 +6,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2 -INSTALLS += target sources +INSTALLS += target 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 5267ccf012..a60dbbe2dc 100644 --- a/examples/opengl/grabber/grabber.pro +++ b/examples/opengl/grabber/grabber.pro @@ -7,9 +7,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber -INSTALLS += target sources +INSTALLS += target 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 33e7c266c8..acaca35635 100644 --- a/examples/opengl/hellogl/hellogl.pro +++ b/examples/opengl/hellogl/hellogl.pro @@ -12,9 +12,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro index 850e4e8994..56328030d5 100644 --- a/examples/opengl/hellogl_es/hellogl_es.pro +++ b/examples/opengl/hellogl_es/hellogl_es.pro @@ -8,6 +8,4 @@ HEADERS += glwindow.h RESOURCES += texture.qrc target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es -INSTALLS += target sources +INSTALLS += target diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro index 4195ce2e67..cf6572b548 100644 --- a/examples/opengl/hellogl_es2/hellogl_es2.pro +++ b/examples/opengl/hellogl_es2/hellogl_es2.pro @@ -13,9 +13,7 @@ RESOURCES += texture.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2 -INSTALLS += target sources +INSTALLS += target maemo5 { # Debian package name may not contain numbers or special characters diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro index cc199f4d4d..cc220fd344 100644 --- a/examples/opengl/hellowindow/hellowindow.pro +++ b/examples/opengl/hellowindow/hellowindow.pro @@ -5,7 +5,5 @@ SOURCES += hellowindow.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellowindow -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellowindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellowindow -INSTALLS += target sources +INSTALLS += target diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 387f8a0d75..1a6ac3aeb2 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -25,10 +25,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ SUBDIRS += hellowindow \ paintedwindow -# install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl -INSTALLS += target sources +EXAMPLE_FILES = shared QT += widgets diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro index 17ffbe6171..08fe9b3dae 100644 --- a/examples/opengl/overpainting/overpainting.pro +++ b/examples/opengl/overpainting/overpainting.pro @@ -12,14 +12,6 @@ SOURCES = bubble.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - overpainting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting -INSTALLS += target \ - sources - +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro index fd7446ebc0..1846aa4049 100644 --- a/examples/opengl/paintedwindow/paintedwindow.pro +++ b/examples/opengl/paintedwindow/paintedwindow.pro @@ -3,6 +3,4 @@ SOURCES += paintedwindow.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/paintedwindow -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS paintedwindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/paintedwindow -INSTALLS += target sources +INSTALLS += target diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro index 3145233179..1a9882c45d 100644 --- a/examples/opengl/pbuffers/pbuffers.pro +++ b/examples/opengl/pbuffers/pbuffers.pro @@ -8,14 +8,6 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - pbuffers.pro \ - *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers -INSTALLS += target \ - sources - +INSTALLS += target 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 1cc8a5ad31..31fd22cced 100644 --- a/examples/opengl/pbuffers2/pbuffers2.pro +++ b/examples/opengl/pbuffers2/pbuffers2.pro @@ -6,8 +6,6 @@ RESOURCES += pbuffers2.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2 -INSTALLS += target sources +INSTALLS += target 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 3196c6c45a..5793ea3e68 100644 --- a/examples/opengl/samplebuffers/samplebuffers.pro +++ b/examples/opengl/samplebuffers/samplebuffers.pro @@ -5,9 +5,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers -sources.files = $$SOURCES $$HEADERS samplebuffers.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers -INSTALLS += target sources +INSTALLS += target 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 ae8672d939..b912baaa9b 100644 --- a/examples/opengl/textures/textures.pro +++ b/examples/opengl/textures/textures.pro @@ -8,9 +8,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) |