diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-27 12:19:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-27 12:19:18 (GMT) |
| commit | c75aabbb022e3c2db246e2fd90a36662cf28ec24 (patch) | |
| tree | 3006147ba148e0d822d50385479ef7a1f6afdf96 | |
| parent | d7489680a80df5d77fbc032b1bc656a8dab1a986 (diff) | |
| parent | 3ddab0c939ded21ed530dff685f6a0d491457065 (diff) | |
| download | Qt-c75aabbb022e3c2db246e2fd90a36662cf28ec24.zip Qt-c75aabbb022e3c2db246e2fd90a36662cf28ec24.tar.gz Qt-c75aabbb022e3c2db246e2fd90a36662cf28ec24.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Disabled activeqt/webbrowser example from mingw build.
| -rw-r--r-- | examples/activeqt/activeqt.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 79d257a..ad41a47 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -12,6 +12,9 @@ contains(QT_CONFIG, opengl):SUBDIRS += opengl # For now only the contain examples with mingw, for the others you need # an IDL compiler win32-g++*|wince*:SUBDIRS = webbrowser +# Due to build problems, active qt was disabled from mingw build, +# so we have to remove the only one left +win32-g++*:SUBDIRS = # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt |