diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 13:59:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 13:59:05 (GMT) |
| commit | b4d88c1bb1b21cce7928b3466776ad41c9424cea (patch) | |
| tree | d62a62e26841c54019c765ead734b27c12a142b2 /src/tools/uic3/uic3.pro | |
| parent | aaf8bc90b779d944cb672108ae037d98ea2d1613 (diff) | |
| parent | 0dbbb137f432e99113ac513c542b4a8431b00b5d (diff) | |
| download | Qt-b4d88c1bb1b21cce7928b3466776ad41c9424cea.zip Qt-b4d88c1bb1b21cce7928b3466776ad41c9424cea.tar.gz Qt-b4d88c1bb1b21cce7928b3466776ad41c9424cea.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (241 commits)
Fix memory leak in QXmlQuery::setQuery.
QDeclarativeMouseArea: block context menu events
ListViews loses items if all visible items are removed.
Make TextEdit word selection more natural.
Clear confusion between QMainWindow and QMainWindowLayout.
Fix for rounded corners bug in QMenu
QWidgetPrivate::setParent_sys might be using null pointer
Ensure the TextEdit cursor delegate is repositioned on mouse events.
Don't crash on an invalid replacementStart from an input method.
Fix incorrect hardware address on systems without getifaddrs()
Enable multisampling on Symbian if hw supports it
Fix QtCoreu.def file error
Introduce platform extension to QGraphicsSystem
Fix Symbian/WinsCW build break
Prevent crash in OpenGL engine when scaling images / pixmaps.
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
Fix -no-gui
Don't run XLib check if -no-gui is used
Ukrainian translation updated
fix random miscompilation with msvc
...
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 |