diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:31:19 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:31:19 (GMT) |
| commit | 01fec63b7b8f8cae94f92fca1d806fe8c6156299 (patch) | |
| tree | cd07670f7521cce4743497c4b21ce56cc8fbbfec /examples | |
| parent | 095c92f03e0c01b878eaa0cd1b7844171ce9241f (diff) | |
| parent | 3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a (diff) | |
| download | Qt-01fec63b7b8f8cae94f92fca1d806fe8c6156299.zip Qt-01fec63b7b8f8cae94f92fca1d806fe8c6156299.tar.gz Qt-01fec63b7b8f8cae94f92fca1d806fe8c6156299.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/effects/effects.pro | 6 | ||||
| -rw-r--r-- | examples/webkit/formextractor/formextractor.pro | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/examples/effects/effects.pro b/examples/effects/effects.pro index 2dec8d5..0f062ee 100644 --- a/examples/effects/effects.pro +++ b/examples/effects/effects.pro @@ -5,12 +5,6 @@ SUBDIRS = \ lighting \ fademessage -!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl) { - contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { - SUBDIRS += customshader - } -} - # install target.path = $$[QT_INSTALL_EXAMPLES]/effects sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkit/formextractor/formextractor.pro index 4364b4c..51e0c45 100644 --- a/examples/webkit/formextractor/formextractor.pro +++ b/examples/webkit/formextractor/formextractor.pro @@ -1,5 +1,5 @@ QT += webkit network -TARGET = formExtractor +TARGET = formextractor TEMPLATE = app SOURCES += main.cpp \ formextractor.cpp \ |