diff --git a/qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch b/qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch new file mode 100644 index 0000000..0e00cce --- /dev/null +++ b/qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch @@ -0,0 +1,14 @@ +diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/gui/kernel/qapplication.cpp.QT_GRAPHICSSYSTEM qt-everywhere-opensource-src-4.7.0-beta1/src/gui/kernel/qapplication.cpp +--- qt-everywhere-opensource-src-4.7.0-beta1/src/gui/kernel/qapplication.cpp.QT_GRAPHICSSYSTEM 2010-05-03 19:43:24.000000000 -0500 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/gui/kernel/qapplication.cpp 2010-05-17 13:56:33.851069964 -0500 +@@ -774,6 +774,10 @@ void QApplicationPrivate::construct( + + qt_is_gui_used = (qt_appType != QApplication::Tty); + process_cmdline(); ++ // the environment variable has the lowest precedence of runtime graphicssystem switches ++ if (graphics_system_name.isEmpty()) { ++ graphics_system_name = QString::fromLocal8Bit(qgetenv("QT_GRAPHICSSYSTEM")); ++ } + // Must be called before initialize() + qt_init(this, qt_appType + #ifdef Q_WS_X11 diff --git a/qt.spec b/qt.spec index 5390c50..12edc9f 100644 --- a/qt.spec +++ b/qt.spec @@ -15,7 +15,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.7.0 -Release: 0.12.%{pre}%{?dist} +Release: 0.13.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -71,6 +71,8 @@ Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch Patch208: 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch Patch209: 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch +# based on http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/55ef01d93f8257b5927660290fc1ead0b2b74ec9.patch +Patch217: qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg Source11: hi16-phonon-gstreamer.png @@ -428,6 +430,7 @@ Qt libraries used for drawing widgets and OpenGL items. #patch207 -p1 -b .kde-qt-0007 %patch212 -p1 -b .kde-qt-0012 %endif +%patch217 -p1 -b .QT_GRAPHICSSYSTEM # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -1064,6 +1067,9 @@ fi %changelog +* Mon May 17 2010 Rex Dieter - 4.7.0-0.13.beta1 +- QT_GRAPHICSSYSTEM env support + * Sun May 16 2010 Rex Dieter - 4.7.0-0.12.beta1 - -webkit-devel: move Qt/qweb*.h here (#592680)