apply patch to fix regression

This commit is contained in:
Than Ngo 2008-08-06 08:04:36 +00:00
parent a09f5c0f0f
commit d1e33e5e08
2 changed files with 13 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- qt/src/gui/kernel/qwidget.cpp 2008-08-01 16:08:30.000000000 +0100
+++ qt/src/gui/kernel/qwidget.cpp 2008-08-05 11:22:40.000000000 +0100
@@ -9095,8 +9095,6 @@
break;
#endif
case Qt::WA_NativeWindow:
- if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
- parentWidget()->d_func()->enforceNativeChildren();
if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
d->createWinId();
break;

View File

@ -37,6 +37,7 @@ Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
# under GNOME, default to QGtkStyle if available
# (otherwise fall back to QCleanlooksStyle)
Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
Patch10: qt-x11-opensource-src-4.4.1-systray.patch
## qt-copy patches
%define qt_copy 20080805
@ -277,6 +278,7 @@ test -x apply_patches && ./apply_patches
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch8 -p1 -b .font-aliases
%patch9 -p1 -b .qgtkstyle
%patch10 -p1 -b .systray
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`