diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:55:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:55:54 (GMT) |
| commit | 1cfa8d81f04e02860df85a3b7acf41974982adae (patch) | |
| tree | 01282181ab20b7637ceb75d0c26cef15d1d916b5 /tools/tools.pro | |
| parent | 934d4b9852060b2870f6774cd854331422147d3e (diff) | |
| parent | eea71824f57dd61b0a513e3bbb5ced99de505d73 (diff) | |
| download | Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.zip Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.tar.gz Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2/4.6
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'tools/tools.pro')
| -rw-r--r-- | tools/tools.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 87ba3c9..4cff507 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -31,5 +31,7 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator embedded: SUBDIRS += makeqpf +!wince*:!cross_compile:SUBDIRS += qdoc3 + CONFIG+=ordered QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" |