diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /examples/opengl/hellogl_es/hellogl_es.pro | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'examples/opengl/hellogl_es/hellogl_es.pro')
-rw-r--r-- | examples/opengl/hellogl_es/hellogl_es.pro | 7 |
1 files changed, 1 insertions, 6 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 |