diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-04 14:43:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-04 18:46:06 +0200 |
| commit | 14a80bd4df83e960de458403deaf895a3d2c8812 (patch) | |
| tree | 1bf8a79b746378b14f64dbb32bb3bf5119d22f0c /src/widgets/kernel | |
| parent | 3acd4b546ded7523f65d60cee6f3809113a91a16 (diff) | |
| parent | 39a290af6cea538dbbdb207d03d2af3602015c95 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index fbf6958923..f53bafcc5f 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1411,6 +1411,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO win->setProperty(propertyName, q->property(propertyName)); } +#ifdef Q_OS_OSX + if (q->testAttribute(Qt::WA_ShowWithoutActivating)) + win->setProperty("_q_showWithoutActivating", QVariant(true)); +#endif win->setFlags(data.window_flags); fixPosIncludesFrame(); if (q->testAttribute(Qt::WA_Moved) |