diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 12:41:42 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 12:41:42 +1000 |
| commit | 662666a5d4d114f91dbed8cbe3ce46fddfe3c82b (patch) | |
| tree | 0b72d67d46bf1693e1b3e2b8669fef8c8c89e766 /tools/designer/src/src.pro | |
| parent | 35a211cd95e0d09ef0b547b57f01f0a9ff41da2f (diff) | |
| parent | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff) | |
| download | qt4-tools-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.gz | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'tools/designer/src/src.pro')
| -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 e1710b8c20..78665b751b 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 |