diff options
| author | Andy Shaw <qt-info@nokia.com> | 2010-06-21 10:08:26 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2010-06-21 10:08:26 (GMT) |
| commit | 033fea2483945aa2ecb238751121098b594a1877 (patch) | |
| tree | f8a2b28e95640dab0e801037722e73b4633d0296 /tests/auto/qtcpserver/crashingServer/crashingServer.pro | |
| parent | 1fb24d6852e34bd58f35172dea4bfd4c41236689 (diff) | |
| parent | 448dd8593f3e7e680ce3d0f92e279aad3c88d7d6 (diff) | |
| download | Qt-033fea2483945aa2ecb238751121098b594a1877.zip Qt-033fea2483945aa2ecb238751121098b594a1877.tar.gz Qt-033fea2483945aa2ecb238751121098b594a1877.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 |