Hello community,
here is the log from the commit of package libqt4
checked in at Tue Apr 3 21:39:36 CEST 2007.
--------
--- libqt4/libqt4.changes 2007-03-17 01:24:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-03-27 21:53:09.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Mar 27 21:52:51 CEST 2007 - dmueller@suse.de
+
+- update to 4.3.0 beta
+ * no upstream ChangeLog available yet
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
Old:
----
0145-qabstractitemview-dropindicator.diff
0146-rasterpaint-qbrush-image.diff
0149-qdbusconnection-nowarning.diff
0153-qdbuscpp2xml.diff
0154-qdbuscpp2xml-moc_path.diff
0157-qdbus-leak-local-call.diff
fix-x11-names-in-qcolor.diff
gcc-43-warnings.diff
qt-x11-opensource-src-4.2.3.tar.bz2
New:
----
0164-qdbuscontext-nocrash.diff
qt-x11-opensource-src-4.3.0beta.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.v10858/_old 2007-04-03 21:38:43.000000000 +0200
+++ /var/tmp/diff_new_pack.v10858/_new 2007-04-03 21:38:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-devel-doc-data (Version 4.2.3)
+# spec file for package libqt4-devel-doc-data (Version 4.2.90)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,10 +24,10 @@
BuildArch: noarch
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.2.3
-Release: 2
+Version: 4.2.90
+Release: 1
%define x11_free -x11-opensource-src-
-%define rversion 4.2.3
+%define rversion 4.3.0beta
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -37,20 +37,13 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
-Patch7: fix-x11-names-in-qcolor.diff
-Patch10: 0145-qabstractitemview-dropindicator.diff
-Patch11: 0146-rasterpaint-qbrush-image.diff
-Patch14: 0149-qdbusconnection-nowarning.diff
-Patch16: 0154-qdbuscpp2xml-moc_path.diff
Patch18: fix-string-literal-comparison.diff
-Patch19: gcc-43-warnings.diff
Patch20: qt-font-choose.diff
Patch21: 0142-uic3-wordWrapAttribute.diff
-Patch22: 0153-qdbuscpp2xml.diff
-Patch23: 0157-qdbus-leak-local-call.diff
+Patch22: 0164-qdbuscontext-nocrash.diff
Patch24: qt4-pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/
+%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations
%description
The package contains documentation and examples to develop Qt
@@ -63,25 +56,19 @@
--------
Troll Tech AS, Norway
+%if 0%{?opensuse_bs}
+%endif
%prep
%define plugindir %_libdir/qt4/plugins
%setup -q -n qt%x11_free%rversion
-#%patch -p1
%patch2
%patch3
%patch5
%patch6
-%patch7
-%patch10
-%patch11
-%patch14
-%patch16
%patch18
-%patch19 -p1
%patch20
%patch21
%patch22
-%patch23
%patch24
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
@@ -99,7 +86,7 @@
sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix
echo yes | ./configure %common_options
pushd src
-make %{?jobs:-j%jobs} sub-tools_moc sub-tools_rcc sub-tools_uic sub-tools_uic3
+make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic
popd
%install
@@ -120,6 +107,9 @@
/usr/share/doc/packages/libqt4/examples
%changelog
+* Tue Mar 27 2007 - dmueller@suse.de
+- update to 4.3.0 beta
+ * no upstream ChangeLog available yet
* Sat Mar 17 2007 - dmueller@suse.de
- fix headers for more recent gcc's
* Tue Mar 13 2007 - dmueller@suse.de
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.v10858/_old 2007-04-03 21:38:43.000000000 +0200
+++ /var/tmp/diff_new_pack.v10858/_new 2007-04-03 21:38:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4 (Version 4.2.3)
+# spec file for package libqt4 (Version 4.2.90)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,17 @@
# norootforbuild
Name: libqt4
-BuildRequires: Mesa-devel cups-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig
+BuildRequires: Mesa-devel cups-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel
+BuildRequires: libpng-devel pkgconfig
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if %suse_version > 1010
BuildRequires: dbus-1-devel
%endif
+%if %suse_version > 1020
+BuildRequires: fdupes
+%endif
URL: http://www.trolltech.com
License: GNU General Public License (GPL)
Group: System/Libraries
@@ -26,10 +30,10 @@
Obsoletes: qt
Provides: qt
# COMMON-BEGIN
-Version: 4.2.3
-Release: 2
+Version: 4.2.90
+Release: 1
%define x11_free -x11-opensource-src-
-%define rversion 4.2.3
+%define rversion 4.3.0beta
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -39,20 +43,13 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
-Patch7: fix-x11-names-in-qcolor.diff
-Patch10: 0145-qabstractitemview-dropindicator.diff
-Patch11: 0146-rasterpaint-qbrush-image.diff
-Patch14: 0149-qdbusconnection-nowarning.diff
-Patch16: 0154-qdbuscpp2xml-moc_path.diff
Patch18: fix-string-literal-comparison.diff
-Patch19: gcc-43-warnings.diff
Patch20: qt-font-choose.diff
Patch21: 0142-uic3-wordWrapAttribute.diff
-Patch22: 0153-qdbuscpp2xml.diff
-Patch23: 0157-qdbus-leak-local-call.diff
+Patch22: 0164-qdbuscontext-nocrash.diff
Patch24: qt4-pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/
+%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations
%description
Qt is a set of libraries for developing applications.
@@ -66,25 +63,19 @@
--------
Troll Tech AS, Norway
+%if 0%{?opensuse_bs}
+%endif
%prep
%define plugindir %_libdir/qt4/plugins
%setup -q -n qt%x11_free%rversion
-#%patch -p1
%patch2
%patch3
%patch5
%patch6
-%patch7
-%patch10
-%patch11
-%patch14
-%patch16
%patch18
-%patch19 -p1
%patch20
%patch21
%patch22
-%patch23
%patch24
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
@@ -220,9 +211,6 @@
%install
make INSTALL_ROOT=$RPM_BUILD_ROOT install
# argggh, qmake is such a piece of <censored>
-mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
-mv $RPM_BUILD_ROOT/%_libdir/*.pc $RPM_BUILD_ROOT/%_libdir/pkgconfig
-# qmake is even a bigger piece of <censored>
find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \;
find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
find $RPM_BUILD_ROOT/%_docdir/%name -type f -name 'lib*.a' -exec rm {} \;
@@ -236,23 +224,22 @@
$RPM_BUILD_ROOT/usr/share/doc/packages/%name/
fi
ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/libqt4/demos
-%if %suse_version > 1010
-mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/dbus-viewer/dbus-viewer $RPM_BUILD_ROOT/usr/bin
-rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/demos/dbus-viewer
-%endif
-# clean up file duplicates
-oldsum="invalid"
-oldname="invalid"
-md5sum $RPM_BUILD_ROOT/usr/include/Qt*/* | sort | while read sum fname; do
- if test "$sum" = "$oldsum"; then
- echo "determined that $oldname and $fname is equal"
- rm -f "$fname"
- ln -s ../$(echo $oldname | sed -e "s,$RPM_BUILD_ROOT/usr/include/,,") "$fname"
- else
- oldsum=$sum
- oldname=$fname
+# clean up the mental derangement
+%if %suse_version > 1020
+for f in $RPM_BUILD_ROOT/usr/include/Qt*/*; do
+ if test -f $f -a $(wc -l < $f) -eq 1; then
+ incfile=$(cut -d'"' -f2 $f)
+ cp -a $(dirname $f)/$incfile $f
fi
done
+fdupes -q -r -1 $RPM_BUILD_ROOT/usr/include/ | \
+ sed -e "s,$RPM_BUILD_ROOT,," | \
+ while read target rest; do
+ for f in $rest; do
+ ln -f $target $f
+ done
+done
+%endif
# packaged in libqt4-devel-doc-data
rm -rf $RPM_BUILD_ROOT/%_docdir/libqt4/{html,examples}
#
@@ -302,7 +289,7 @@
%dir %plugindir
%dir /usr/share/qt4
%dir /usr/share/doc/packages/%name
-/usr/share/doc/packages/%name/changes-*
+#/usr/share/doc/packages/%name/changes-*
%_libdir/libQtCore*.so.*
%_libdir/libQtNetwork*.so.*
%_libdir/libQtXml*.so.*
@@ -315,7 +302,7 @@
%exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so
/usr/bin/qtconfig
%if %suse_version > 1010
-/usr/bin/dbus-viewer
+/usr/bin/qdbusviewer
%endif
/usr/share/applications/qt4config.desktop
# designer.png is referenced by qt4config.desktop
@@ -323,6 +310,7 @@
%_libdir/libQtGui*.so.*
%_libdir/libQtOpenGL*.so.*
%_libdir/libQtSvg.so.*
+%_libdir/libQtScript.so.*
%_libdir/libQtDesigner*.so.*
%_libdir/libQtAssistantClient.so.*
@@ -394,6 +382,9 @@
%_libdir/libQtSql*.so.*
%changelog
+* Tue Mar 27 2007 - dmueller@suse.de
+- update to 4.3.0 beta
+ * no upstream ChangeLog available yet
* Sat Mar 17 2007 - dmueller@suse.de
- fix headers for more recent gcc's
* Tue Mar 13 2007 - dmueller@suse.de
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.v10858/_old 2007-04-03 21:38:43.000000000 +0200
+++ /var/tmp/diff_new_pack.v10858/_new 2007-04-03 21:38:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-sql-plugins (Version 4.2.3)
+# spec file for package libqt4-sql-plugins (Version 4.2.90)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,10 +23,10 @@
Summary: Qt 4 SQL-Related Libraries
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.2.3
-Release: 2
+Version: 4.2.90
+Release: 1
%define x11_free -x11-opensource-src-
-%define rversion 4.2.3
+%define rversion 4.3.0beta
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -36,20 +36,13 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
-Patch7: fix-x11-names-in-qcolor.diff
-Patch10: 0145-qabstractitemview-dropindicator.diff
-Patch11: 0146-rasterpaint-qbrush-image.diff
-Patch14: 0149-qdbusconnection-nowarning.diff
-Patch16: 0154-qdbuscpp2xml-moc_path.diff
Patch18: fix-string-literal-comparison.diff
-Patch19: gcc-43-warnings.diff
Patch20: qt-font-choose.diff
Patch21: 0142-uic3-wordWrapAttribute.diff
-Patch22: 0153-qdbuscpp2xml.diff
-Patch23: 0157-qdbus-leak-local-call.diff
+Patch22: 0164-qdbuscontext-nocrash.diff
Patch24: qt4-pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/
+%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations
%description
Qt 4 libraries that are used for connection with an SQL server. You
@@ -61,25 +54,19 @@
--------
Troll Tech AS, Norway
+%if 0%{?opensuse_bs}
+%endif
%prep
%define plugindir %_libdir/qt4/plugins
%setup -q -n qt%x11_free%rversion
-#%patch -p1
%patch2
%patch3
%patch5
%patch6
-%patch7
-%patch10
-%patch11
-%patch14
-%patch16
%patch18
-%patch19 -p1
%patch20
%patch21
%patch22
-%patch23
%patch24
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
@@ -166,8 +153,7 @@
%install
export QTDIR=$PWD
-make INSTALL_ROOT=$RPM_BUILD_ROOT sub-src-install_subtargets
-rm -f $RPM_BUILD_ROOT/usr/share/qt/mkspecs/*/qmake.conf.orig
+make INSTALL_ROOT=$RPM_BUILD_ROOT -C src install_subtargets
# argggh, qmake is such a piece of <censored>
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
@@ -219,6 +205,9 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
+* Tue Mar 27 2007 - dmueller@suse.de
+- update to 4.3.0 beta
+ * no upstream ChangeLog available yet
* Sat Mar 17 2007 - dmueller@suse.de
- fix headers for more recent gcc's
* Tue Mar 13 2007 - dmueller@suse.de
++++++ 0164-qdbuscontext-nocrash.diff ++++++
qt-bugs@ issue: none
Trolltech task ID: none
applied: yes
author: Trolltech
Add patch found in Qt 4.3 snapshot 20070315.
I wonder why it's not part of beta 1.
=== tools/qdbus/src/qdbusintegrator.cpp
==================================================================
--- tools/qdbus/src/qdbusintegrator.cpp (revision 491)
+++ tools/qdbus/src/qdbusintegrator.cpp (revision 492)
@@ -694,7 +694,9 @@
fail = data.object->qt_metacall(QMetaObject::InvokeMetaMethod,
data.slotIdx, params.data()) >= 0;
QDBusConnectionPrivate::setSender(0);
- QDBusContextPrivate::set(data.object, old);
+ // the object might be deleted in the slot
+ if (!data.object.isNull())
+ QDBusContextPrivate::set(data.object, old);
}
// do we create a reply? Only if the caller is waiting for a reply and one hasn't been sent
++++++ libqt4-devel-doc-data.spec.in ++++++
--- libqt4/libqt4-devel-doc-data.spec.in 2007-02-12 13:22:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.spec.in 2007-03-28 14:55:59.000000000 +0200
@@ -36,7 +36,7 @@
sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix
echo yes | ./configure %common_options
pushd src
-make %{?jobs:-j%jobs} sub-tools_moc sub-tools_rcc sub-tools_uic sub-tools_uic3
+make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic
popd
%install
++++++ libqt4-sql-plugins.spec.in ++++++
--- libqt4/libqt4-sql-plugins.spec.in 2007-02-12 13:22:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-sql-plugins.spec.in 2007-03-28 16:49:12.000000000 +0200
@@ -104,8 +104,7 @@
%install
export QTDIR=$PWD
-make INSTALL_ROOT=$RPM_BUILD_ROOT sub-src-install_subtargets
-rm -f $RPM_BUILD_ROOT/usr/share/qt/mkspecs/*/qmake.conf.orig
+make INSTALL_ROOT=$RPM_BUILD_ROOT -C src install_subtargets
# argggh, qmake is such a piece of <censored>
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
++++++ plastik-default.diff ++++++
--- /var/tmp/diff_new_pack.v10858/_old 2007-04-03 21:38:43.000000000 +0200
+++ /var/tmp/diff_new_pack.v10858/_new 2007-04-03 21:38:43.000000000 +0200
@@ -1,11 +1,11 @@
--- src/gui/kernel/qapplication.cpp
+++ src/gui/kernel/qapplication.cpp
-@@ -1118,7 +1118,7 @@
- #elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
- style = QLatin1String("SGI"); // default style for X11 on IRIX
+@@ -1143,7 +1143,7 @@ QStyle *QApplication::style()
+ #elif defined(Q_WS_X11) && defined(Q_OS_MAC)
+ style = QLatin1String("Plastique"); // default style for X11 on Darwin
#elif defined(Q_WS_X11)
-- style = QLatin1String("Motif"); // default style for X11
-+ style = QLatin1String("Plastique"); // default style for X11
+- style = QLatin1String("Motif"); // default style for X11
++ style = QLatin1String("Plastique"); // default style for X11
#elif defined(Q_WS_MAC)
- style = QLatin1String("Macintosh"); // default style for all Mac's
+ style = QLatin1String("Macintosh"); // default style for all Mac's
#elif defined(Q_WS_QWS)
++++++ qt4-pedantic-headers.diff ++++++
--- /var/tmp/diff_new_pack.v10858/_old 2007-04-03 21:38:43.000000000 +0200
+++ /var/tmp/diff_new_pack.v10858/_new 2007-04-03 21:38:43.000000000 +0200
@@ -1,17 +1,6 @@
---- src/corelib/kernel/qtimer.h
-+++ src/corelib/kernel/qtimer.h
-@@ -63,7 +63,7 @@ public Q_SLOTS:
- void stop();
-
- #ifdef QT3_SUPPORT
-- inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); };
-+ inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); }
- QT_MOC_COMPAT int start(int msec, bool sshot);
- #endif
-
--- src/corelib/io/qfile.h
+++ src/corelib/io/qfile.h
-@@ -96,6 +96,6 @@ public:
+@@ -96,7 +96,7 @@
static QByteArray encodeName(const QString &fileName);
static QString decodeName(const QByteArray &localFileName);
inline static QString decodeName(const char *localFileName)
@@ -19,20 +8,21 @@
+ { return decodeName(QByteArray(localFileName)); }
static void setEncodingFunction(EncoderFn);
static void setDecodingFunction(DecoderFn);
---- src/gui/kernel/qevent.h
-+++ src/gui/kernel/qevent.h
-@@ -650,7 +650,7 @@ public:
- QClipboardEvent(QEventPrivate *data);
- ~QClipboardEvent();
-- QEventPrivate *data() { return d; };
-+ QEventPrivate *data() { return d; }
- };
+--- src/corelib/kernel/qtimer.h
++++ src/corelib/kernel/qtimer.h
+@@ -63,7 +63,7 @@
+ void stop();
+
+ #ifdef QT3_SUPPORT
+- inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); };
++ inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); }
+ QT_MOC_COMPAT int start(int msec, bool sshot);
#endif
--- src/gui/kernel/qapplication.h
+++ src/gui/kernel/qapplication.h
-@@ -279,7 +279,7 @@ public:
+@@ -279,7 +279,7 @@
inline static QT3_SUPPORT void setOverrideCursor(const QCursor &cursor, bool replace)
{ if (replace) changeOverrideCursor(cursor); else setOverrideCursor(cursor); }
inline static QT3_SUPPORT bool hasGlobalMouseTracking() {return true;}
@@ -41,7 +31,7 @@
inline static QT3_SUPPORT void flushX() { flush(); }
static inline QT3_SUPPORT void setWinStyleHighlightColor(const QColor &c) {
QPalette p(palette());
-@@ -289,6 +289,6 @@ public:
+@@ -289,7 +289,7 @@
static inline QT3_SUPPORT const QColor &winStyleHighlightColor()
{ return palette().color(QPalette::Active, QPalette::Highlight); }
static inline QT3_SUPPORT void setPalette(const QPalette &pal, bool, const char* className = 0)
@@ -49,9 +39,32 @@
+ { setPalette(pal, className); }
static inline QT3_SUPPORT void setFont(const QFont &font, bool, const char* className = 0)
{ setFont(font, className); }
+
+--- src/gui/kernel/qevent.h
++++ src/gui/kernel/qevent.h
+@@ -650,7 +650,7 @@
+ QClipboardEvent(QEventPrivate *data);
+ ~QClipboardEvent();
+
+- QEventPrivate *data() { return d; };
++ QEventPrivate *data() { return d; }
+ };
+ #endif
+
+--- src/gui/kernel/qwidget.h
++++ src/gui/kernel/qwidget.h
+@@ -721,7 +721,7 @@
+ inline QT3_SUPPORT void setFont(const QFont &f, bool) { setFont(f); }
+ inline QT3_SUPPORT void setPalette(const QPalette &p, bool) { setPalette(p); }
+ enum BackgroundOrigin { WidgetOrigin, ParentOrigin, WindowOrigin, AncestorOrigin };
+- inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin){};
++ inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin){}
+ inline QT3_SUPPORT BackgroundOrigin backgroundOrigin() const { return WindowOrigin; }
+ inline QT3_SUPPORT QPoint backgroundOffset() const { return QPoint(); }
+ inline QT3_SUPPORT void repaint(bool) { repaint(); }
--- src/gui/painting/qstylepainter.h
+++ src/gui/painting/qstylepainter.h
-@@ -44,7 +44,7 @@ public:
+@@ -44,7 +44,7 @@
widget = w;
wstyle = w->style();
return QPainter::begin(pd);
@@ -60,9 +73,22 @@
inline void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption &opt);
inline void drawControl(QStyle::ControlElement ce, const QStyleOption &opt);
inline void drawComplexControl(QStyle::ComplexControl cc, const QStyleOptionComplex &opt);
+--- src/gui/widgets/qslider.h
++++ src/gui/widgets/qslider.h
+@@ -93,8 +93,8 @@
+ inline QT3_SUPPORT void setTickmarks(TickPosition position) { setTickPosition(position); }
+ inline QT3_SUPPORT TickPosition tickmarks() const { return tickPosition(); }
+ public Q_SLOTS:
+- inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); };
+- inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); };
++ inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); }
++ inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); }
+ #endif
+
+ private:
--- src/network/qnativesocketengine_unix.cpp
+++ src/network/qnativesocketengine_unix.cpp
-@@ -128,7 +128,7 @@ static inline void qt_socket_getPortAndA
+@@ -128,7 +128,7 @@
*addr = tmpAddress;
#ifndef QT_NO_IPV6IFNAME
char scopeid[IFNAMSIZ];
@@ -71,3 +97,14 @@
addr->setScopeId(QLatin1String(scopeid));
} else
#endif
+--- src/gui/widgets/qmainwindow.h
++++ src/gui/widgets/qmainwindow.h
+@@ -60,7 +60,7 @@ public:
+ AllowNestedDocks = 0x02,
+ AllowTabbedDocks = 0x04,
+ ForceTabbedDocks = 0x08, // implies AllowTabbedDocks, !AllowNestedDocks
+- VerticalTabs = 0x10, // implies AllowTabbedDocks
++ VerticalTabs = 0x10 // implies AllowTabbedDocks
+ };
+ Q_DECLARE_FLAGS(DockOptions, DockOption)
+
++++++ use-freetype-default.diff ++++++
--- /var/tmp/diff_new_pack.v10858/_old 2007-04-03 21:38:43.000000000 +0200
+++ /var/tmp/diff_new_pack.v10858/_new 2007-04-03 21:38:43.000000000 +0200
@@ -1,25 +1,26 @@
--- src/gui/text/qfontengine_x11.cpp
+++ src/gui/text/qfontengine_x11.cpp
-@@ -1201,6 +1201,8 @@
- return face_id;
+@@ -809,6 +809,7 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte
+ *antialias = b;
}
+#include