Hello community, here is the log from the commit of package qt3 checked in at Fri Jun 9 23:33:22 CEST 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-06-01 00:14:36.000000000 +0200 +++ qt3/qt3-devel-doc.changes 2006-06-09 23:31:04.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 9 15:25:49 CEST 2006 - llunak@suse.de + +- add $QT_SYSTEM_DIR (#183059) + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.nDhVzk/_old 2006-06-09 23:31:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nDhVzk/_new 2006-06-09 23:31:21.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.6 -Release: 6 +Release: 7 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -236,6 +236,8 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Fri Jun 09 2006 - llunak@suse.de +- add $QT_SYSTEM_DIR (#183059) * Wed May 31 2006 - adrian@suse.de - remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.nDhVzk/_old 2006-06-09 23:31:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nDhVzk/_new 2006-06-09 23:31:21.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.6 -Release: 6 +Release: 7 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -476,6 +476,8 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Fri Jun 09 2006 - llunak@suse.de +- add $QT_SYSTEM_DIR (#183059) * Wed May 31 2006 - adrian@suse.de - remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.nDhVzk/_old 2006-06-09 23:31:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nDhVzk/_new 2006-06-09 23:31:21.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 6 +Release: 7 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -245,6 +245,8 @@ #/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Fri Jun 09 2006 - llunak@suse.de +- add $QT_SYSTEM_DIR (#183059) * Wed May 31 2006 - adrian@suse.de - remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.nDhVzk/_old 2006-06-09 23:31:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nDhVzk/_new 2006-06-09 23:31:21.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 6 +Release: 7 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -376,6 +376,8 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Fri Jun 09 2006 - llunak@suse.de +- add $QT_SYSTEM_DIR (#183059) * Wed May 31 2006 - adrian@suse.de - remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller@suse.de ++++++ qtrc-path.diff ++++++ --- /var/tmp/diff_new_pack.nDhVzk/_old 2006-06-09 23:31:27.000000000 +0200 +++ /var/tmp/diff_new_pack.nDhVzk/_new 2006-06-09 23:31:27.000000000 +0200 @@ -1,5 +1,5 @@ ---- src/tools/qsettings.cpp -+++ src/tools/qsettings.cpp +--- src/tools/qsettings.cpp.sav 2006-03-08 17:47:37.000000000 +0100 ++++ src/tools/qsettings.cpp 2006-06-09 14:18:14.000000000 +0200 @@ -36,6 +36,7 @@ **********************************************************************/ @@ -8,7 +8,7 @@ // POSIX Large File Support redefines open -> open64 static inline int qt_open( const char *pathname, int flags, mode_t mode ) -@@ -465,8 +466,18 @@ +@@ -465,8 +466,18 @@ QSettingsPrivate::QSettingsPrivate( QSet Q_UNUSED( format ); #endif @@ -29,3 +29,18 @@ #ifdef Q_WS_WIN #ifdef Q_OS_TEMP TCHAR path[MAX_PATH]; +@@ -502,6 +513,14 @@ QSettingsPrivate::QSettingsPrivate( QSet + #else + defPath = qInstallPathSysconf(); + #endif ++ QString system; ++ system = getenv("QT_SYSTEM_DIR"); ++ if ( !system.isEmpty() ){ ++ QFileInfo i( system + "/qtrc" ); ++ if ( i.isReadable() ) ++ defPath = system; ++ } ++ + QDir dir(appSettings); + if (! dir.exists()) { + if (! dir.mkdir(dir.path())) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de