diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-06-11 12:06:41 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2010-06-11 12:06:41 (GMT) |
commit | d92d1106e8cb2ca14b26b8c027d52608ee2915e9 (patch) | |
tree | 91b75077ecf9fb4709f000b89d5963ab98cdfc9b /tests/auto/qtcpserver/crashingServer/crashingServer.pro | |
parent | a295a69e76ff330a2716c97b70723f0bd408f197 (diff) | |
parent | 24bcac9de46c89f4d8b533946e7b0feeacca1b0d (diff) | |
download | Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.zip Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.gz Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/qtcpserver/crashingServer/crashingServer.pro')
-rw-r--r-- | tests/auto/qtcpserver/crashingServer/crashingServer.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/qtcpserver/crashingServer/crashingServer.pro index 70e42b4..0bea655 100644 --- a/tests/auto/qtcpserver/crashingServer/crashingServer.pro +++ b/tests/auto/qtcpserver/crashingServer/crashingServer.pro @@ -5,4 +5,4 @@ DESTDIR = ./ # This means the auto test works on some machines for MinGW. No dialog stalls # the application. -win32-g++:CONFIG += console +win32-g++*:CONFIG += console |