diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 10:00:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 10:00:44 (GMT) |
| commit | d94a8aba64a9b3d3e2ecff943d3c717d68074e36 (patch) | |
| tree | 9cbcde1cdab5b24bd33c5581dff5463abea28299 /src/tools/uic3/uic3.pro | |
| parent | 718013958724210915b24142c499154f751f0bac (diff) | |
| parent | a780cf591ed2d311489576152be7c4b453ad5963 (diff) | |
| download | Qt-d94a8aba64a9b3d3e2ecff943d3c717d68074e36.zip Qt-d94a8aba64a9b3d3e2ecff943d3c717d68074e36.tar.gz Qt-d94a8aba64a9b3d3e2ecff943d3c717d68074e36.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix random miscompilation with msvc
don't ignore create_prl for static plugins
make QLibraryInfo return clean paths
make relative paths in qt.conf work inside qmake
Diffstat (limited to 'src/tools/uic3/uic3.pro')
| -rw-r--r-- | src/tools/uic3/uic3.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/uic3/uic3.pro b/src/tools/uic3/uic3.pro index 5ad3c4d..54f7dc8 100644 --- a/src/tools/uic3/uic3.pro +++ b/src/tools/uic3/uic3.pro @@ -1,5 +1,6 @@ TEMPLATE = app CONFIG += console qt_no_compat_warning +win32-msvc*:CONFIG += no_batch # otherwise the wrong main.cpp may be picked up CONFIG -= app_bundle build_all:!build_pass { CONFIG -= build_all |