summaryrefslogtreecommitdiffstats
path: root/src/tools/uic3
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-06 16:09:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-06 16:09:58 (GMT)
commit4ec3288621aabc17ba8637611d39128566072047 (patch)
tree720d6c81b6f3a9e6d1d699701d170db0a334cace /src/tools/uic3
parent4b35a36ca088a79c1aac877d3259e8a981399ee9 (diff)
parentd94a8aba64a9b3d3e2ecff943d3c717d68074e36 (diff)
downloadQt-4ec3288621aabc17ba8637611d39128566072047.zip
Qt-4ec3288621aabc17ba8637611d39128566072047.tar.gz
Qt-4ec3288621aabc17ba8637611d39128566072047.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/tools/uic3')
-rw-r--r--src/tools/uic3/uic3.pro1
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