diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 19:28:12 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 19:28:12 +0200 |
| commit | b4283c0b46885e38db127c8a05a4c6d70797b511 (patch) | |
| tree | 7319f359d7d48b2f52f10ea9bba997aec59f9c5a /src/corelib | |
| parent | f273d6fbc02055ff3999adc0df76360ca0670435 (diff) | |
| parent | 967c18d29694fdeab858691a80cb8400fd02ec33 (diff) | |
Merge branch 'release' into stable
Conflicts:
src/widgets/styles/qwindowsvistastyle.cpp
Change-Id: Ifd17532393ebab8ed454c6a79bab622959ceef95
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qtcore_eval.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index ab575371c8..e9ff786074 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -496,6 +496,7 @@ public: setParent(parentWidget(), Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); QTimer::singleShot(7000, this, SLOT(close())); setAttribute(Qt::WA_DeleteOnClose); + setAttribute(Qt::WA_QuitOnClose, false); } setFixedSize(sizeHint()); |