diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:34:59 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:34:59 (GMT) |
| commit | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (patch) | |
| tree | 265f1ff24e1628b8974b96ec1858cb462d4e4b3e /tools/configure | |
| parent | 9b7a5241a287b71c1ab4a9cd9cd3d89c03136ced (diff) | |
| parent | b65fd82299689a1f353e16caa7d1c896b838762a (diff) | |
| download | Qt-00aeefeeaff4d8c3e25c6f388c5e51c239541f87.zip Qt-00aeefeeaff4d8c3e25c6f388c5e51c239541f87.tar.gz Qt-00aeefeeaff4d8c3e25c6f388c5e51c239541f87.tar.bz2 | |
Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d8c2abd..06c1d9c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3391,10 +3391,7 @@ void Configure::buildHostTools() QString pwd = QDir::currentPath(); QStringList hostToolsDirs; hostToolsDirs - << "src/tools/bootstrap" - << "src/tools/moc" - << "src/tools/rcc" - << "src/tools/uic"; + << "src/tools"; if(dictionary["XQMAKESPEC"].startsWith("wince")) hostToolsDirs << "tools/checksdk"; |