diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-21 16:09:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 05:18:30 +0100 |
| commit | d91cf1e53b450483d92c50965fd3c33ab1da4300 (patch) | |
| tree | b4fefc1e3cb6b740731cf927093bab8cc9010ff8 /examples/opengl | |
| parent | 194899df2443c72ff38aaed9b1b26fc3a192a6f0 (diff) | |
| download | qtbase-d91cf1e53b450483d92c50965fd3c33ab1da4300.tar.gz | |
clean up qmake-generated projects
remove "header" and assignmets which are defaults or bogus,
reorder some assignments.
Change-Id: I67403872168c890ca3b696753ceb01c605d19be7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/hellogl_es/hellogl_es.pro | 7 | ||||
| -rw-r--r-- | examples/opengl/hellogl_es2/hellogl_es2.pro | 11 | ||||
| -rw-r--r-- | examples/opengl/hellowindow/hellowindow.pro | 9 | ||||
| -rw-r--r-- | examples/opengl/paintedwindow/paintedwindow.pro | 10 | ||||
| -rw-r--r-- | examples/opengl/pbuffers2/pbuffers2.pro | 10 |
5 files changed, 3 insertions, 44 deletions
diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro index 6932b77831..ca0a4bf4cd 100644 --- a/examples/opengl/hellogl_es/hellogl_es.pro +++ b/examples/opengl/hellogl_es/hellogl_es.pro @@ -1,17 +1,12 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += gui -# Input SOURCES += main.cpp SOURCES += glwindow.cpp HEADERS += glwindow.h RESOURCES += texture.qrc -QT += gui -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro index d5bc7ba0a5..5a3d170df8 100644 --- a/examples/opengl/hellogl_es2/hellogl_es2.pro +++ b/examples/opengl/hellogl_es2/hellogl_es2.pro @@ -1,12 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Thu Oct 4 19:01:12 2007 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += opengl widgets -# Input SOURCES += main.cpp SOURCES += glwidget.cpp SOURCES += mainwindow.cpp @@ -17,7 +10,6 @@ HEADERS += mainwindow.h HEADERS += bubble.h RESOURCES += texture.qrc -QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2 @@ -25,7 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2 INSTALLS += target sources - maemo5 { # Debian package name may not contain numbers or special characters # such as '_', lets change this in Maemo. diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro index dc724421f5..b5ede1b83f 100644 --- a/examples/opengl/hellowindow/hellowindow.pro +++ b/examples/opengl/hellowindow/hellowindow.pro @@ -1,12 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 27 16:40:46 2011 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT += gui-private core-private -# Input + HEADERS += hellowindow.h SOURCES += hellowindow.cpp main.cpp diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro index a3ae3bace5..098329ac4d 100644 --- a/examples/opengl/paintedwindow/paintedwindow.pro +++ b/examples/opengl/paintedwindow/paintedwindow.pro @@ -1,12 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 27 16:40:46 2011 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += paintedwindow.h SOURCES += paintedwindow.cpp main.cpp @@ -15,4 +6,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/paintedwindow sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS paintedwindow.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/paintedwindow INSTALLS += target sources - diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro index bc3b7bb692..ba3a039da2 100644 --- a/examples/opengl/pbuffers2/pbuffers2.pro +++ b/examples/opengl/pbuffers2/pbuffers2.pro @@ -1,14 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fri May 12 17:15:46 2006 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - QT += opengl svg widgets -# Input HEADERS += glwidget.h SOURCES += glwidget.cpp main.cpp RESOURCES += pbuffers2.qrc @@ -19,5 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2 INSTALLS += target sources - simulator: warning(This example might not fully work on Simulator platform) |