diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 16:50:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 16:50:34 (GMT) |
| commit | 9d636095403f5abecbdff8ffffe658f35ff10001 (patch) | |
| tree | fda62cb14f16f3a8b92b5cd41dc972cac4a19ef6 /tools | |
| parent | c69b74008c72b7e2da5ff4bc57112b89d0a36d7d (diff) | |
| parent | b383ff766764f4d0d9644ca06bfb049d62bdcf2f (diff) | |
| download | Qt-9d636095403f5abecbdff8ffffe658f35ff10001.zip Qt-9d636095403f5abecbdff8ffffe658f35ff10001.tar.gz Qt-9d636095403f5abecbdff8ffffe658f35ff10001.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a regression: icons with slightly wrong ICO header did not load.
Fixed an endless loop if printing web pages.
don't build unneeded QtDesigner parts on Windows CE
Better support for user-generated binary shaders
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/src.pro | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/designer/src/src.pro b/tools/designer/src/src.pro index e1710b8..78665b7 100644 --- a/tools/designer/src/src.pro +++ b/tools/designer/src/src.pro @@ -9,6 +9,4 @@ SUBDIRS = \ CONFIG(shared,shared|static):SUBDIRS += plugins -wince*: SUBDIRS -= designer plugins -symbian: SUBDIRS = uitools -contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= lib components
\ No newline at end of file +symbian|wince*: SUBDIRS = uitools |