rpms/qt/devel qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch, NONE, 1.1 qt.spec, 1.395, 1.396

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30580

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch 
Log Message:
* Mon May 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.13.beta1
- QT_GRAPHICSSYSTEM env support


qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch:
 qapplication.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch ---
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


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- qt.spec	16 May 2010 18:04:07 -0000	1.395
+++ qt.spec	17 May 2010 19:00:57 -0000	1.396
@@ -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-
 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 an
 #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 <rdieter at fedoraproject.org> - 4.7.0-0.13.beta1
+- QT_GRAPHICSSYSTEM env support
+
 * Sun May 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.12.beta1
 - -webkit-devel: move Qt/qweb*.h here (#592680)