diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 17:20:33 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 17:20:33 (GMT) |
| commit | 59a9938f91070ad3699fc6544848f0955ecf0bdd (patch) | |
| tree | 99ad7312ddddf7233290115c7ea5daa3af0b83ec /tests/auto/qapplication/modal/main.cpp | |
| parent | b9307547c717606e08661cf474eeaf81cc0789e6 (diff) | |
| parent | 44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff) | |
| download | Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.zip Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.gz Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.bz2 | |
Merge remote branch 'qt/master' into symbian-socket-engine
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
Diffstat (limited to 'tests/auto/qapplication/modal/main.cpp')
| -rw-r--r-- | tests/auto/qapplication/modal/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp index f9d8fb4..2365991 100644 --- a/tests/auto/qapplication/modal/main.cpp +++ b/tests/auto/qapplication/modal/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -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(); } |