summaryrefslogtreecommitdiffstats
path: root/tests/auto/qapplication
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-14 11:36:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-14 11:36:10 (GMT)
commit0cf5055ed325ec98f4affe21e2ef5181cf0fe830 (patch)
treed5649e4c1bac7a028bab3e72c8d2cf255d38db65 /tests/auto/qapplication
parentd1502cb8e3ed43823d63f6e39e24b0a83625291e (diff)
parent736b8205158dd7b98af862a029b273dff6fb716d (diff)
downloadQt-0cf5055ed325ec98f4affe21e2ef5181cf0fe830.zip
Qt-0cf5055ed325ec98f4affe21e2ef5181cf0fe830.tar.gz
Qt-0cf5055ed325ec98f4affe21e2ef5181cf0fe830.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QApplication: fix crash exit whith native windows
Diffstat (limited to 'tests/auto/qapplication')
-rw-r--r--tests/auto/qapplication/modal/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp
index f9d8fb4..3eaaa0d 100644
--- a/tests/auto/qapplication/modal/main.cpp
+++ b/tests/auto/qapplication/modal/main.cpp
@@ -47,6 +47,7 @@
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
+ QApplication::setAttribute(Qt::AA_NativeWindows); //QTBUG-15774
base *b = new base();
return app.exec();
}