rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- drop qgtkstyle patch (no longer needed)

This commit is contained in:
Rex Dieter 2009-03-03 15:43:46 +00:00
parent 198d07cef4
commit c7ad70855b
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qt-x11-opensource-src-4.4.0-qgtkstyle.patch
View File

@ -1,18 +0,0 @@
diff -ur qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp
--- qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp 2008-04-28 15:11:18.000000000 +0200
+++ qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp 2008-05-27 05:43:57.000000000 +0200
@@ -2262,9 +2262,11 @@
QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows"));
break;
case DE_GNOME:
- if (X11->use_xrender)
- QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks"));
- else
+ if (X11->use_xrender) {
+ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("gtk"));
+ if (!QApplicationPrivate::app_style)
+ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks"));
+ } else
QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows"));
break;
case DE_CDE:

5
qt.spec
View File

@ -37,9 +37,6 @@ Source5: qconfig-multilib.h
Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.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.5.0-rc1-ppc64.patch
## upstreamable bits
# http://bugzilla.redhat.com/485677
@ -306,7 +303,6 @@ test -x apply_patches && ./apply_patches
%patch3 -p1 -b .multilib-QMAKEPATH
%endif
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch9 -p1 -b .qgtkstyle
%patch10 -p1 -b .ppc64
%patch50 -p1 -b .qhostaddress
@ -781,6 +777,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
* Tue Mar 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-2
- License: LGPLv2 with exceptions or GPLv3 with exceptions
- BR: gstreamer-devel
- drop qgtkstyle patch (no longer needed)
* Tue Mar 03 2009 Than Ngo <than@redhat.com> - 4.5.0-1
- 4.5.0