rev 9662 - in branches/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Thu Mar 6 22:05:25 UTC 2008
Author: fabo
Date: 2008-03-06 22:05:25 +0000 (Thu, 06 Mar 2008)
New Revision: 9662
Added:
branches/qt4-x11/debian/libqt4-assistant.install
branches/qt4-x11/debian/libqt4-designer.install
branches/qt4-x11/debian/libqt4-help.install
branches/qt4-x11/debian/libqt4-network.install
branches/qt4-x11/debian/libqt4-opengl.install
branches/qt4-x11/debian/libqt4-script.install
branches/qt4-x11/debian/libqt4-svg.install
branches/qt4-x11/debian/libqt4-test.install
branches/qt4-x11/debian/libqt4-xml.install
branches/qt4-x11/debian/patches/0217-qurl-isempty-regression.diff
branches/qt4-x11/debian/patches/0218-qassert-macro-fix.diff
branches/qt4-x11/debian/patches/fix-qt_bootstrapped-typo.diff
Modified:
branches/qt4-x11/debian/changelog
branches/qt4-x11/debian/control
branches/qt4-x11/debian/libqt4-core.install
branches/qt4-x11/debian/libqt4-dbus.install
branches/qt4-x11/debian/libqt4-gui.install
branches/qt4-x11/debian/libqt4-qt3support.install
branches/qt4-x11/debian/libqt4-sql.install
branches/qt4-x11/debian/libqt4-webkit.install
branches/qt4-x11/debian/patches/series
branches/qt4-x11/debian/qt4-designer.install
Log:
- 1st step in the split:
Create one package for each Qt4 modules.
- Sync with Qt copy patches.
Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/changelog 2008-03-06 22:05:25 UTC (rev 9662)
@@ -13,7 +13,7 @@
* Add patch to set --as-needed flag.
* Refresh qt-copy patches: 0167, 0172, 0178, 0180, 0191, 0192, 0195, 0203,
0209 and 0210.
- * Add qt-copy patches: 0214, 0215 and 0216.
+ * Add qt-copy patches: 0214, 0215, 0216, 0217 and 0218.
* Remove qt-copy patches: 0175, 0176, 0179, 0187, 0194, 0200, 0205 and 0211.
* Remove patches:
* 02_launch_assistant-qt4. assistant was renamed to assistant_adp.
Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/control 2008-03-06 22:05:25 UTC (rev 9662)
@@ -18,30 +18,15 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/qt4-x11
-Package: libqt4-qt3support
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-gui (<< 4.2.1-1)
-Description: Qt 3 compatibility library for Qt 4
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This packages contains the Qt 3 compatibility library for Qt 4. It
- allows applications designed to use deprecated Qt 3 classes and
- functions to work with Qt 4, with help from the qt3to4 porting tool
- found in the libqt4-dev package.
-
Package: libqt4-core
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 core non-GUI functionality runtime library
- Qt is a cross-platform C++ application framework. Qt's primary feature
+Description: Qt 4 core module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This packages contains the core non-GUI shared library, and the Network
- and XML modules.
+ The QtCore module contains core non-GUI functionality.
Package: libqt4-gui
Architecture: any
@@ -50,37 +35,117 @@
Recommends: qt4-qtconfig
Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4), libqt4-designer
Conflicts: libqt4-designer
-Description: Qt 4 core GUI functionality runtime library
- Qt is a cross-platform C++ application framework. Qt's primary feature
+Description: Qt 4 GUI module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This packages contains the core GUI shared library and the OpenGL
- module.
+ The QtGui module extends QtCore with GUI functionality.
+Package: libqt4-network
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 network module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtNetwork module offers classes that allow you to write TCP/IP clients and
+ servers. It provides classes to make network programming easier and portable.
+
+Package: libqt4-opengl
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 OpenGL module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtOpenGL module offers classes that make it easy to use OpenGL in Qt
+ applications.
+ .
+ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D
+ rendering and provides little or no support for GUI programming issues.
+
+Package: libqt4-script
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 script module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtScript module provides classes for making Qt applications scriptable.
+
Package: libqt4-sql
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: libqt4-dev
-Description: Qt 4 SQL database module
- Qt is a cross-platform C++ application framework. Qt's primary feature
+Description: Qt 4 SQL module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This package contains the SQL module for Qt. It includes support for
- PostgreSQL, MySQL, and SQLite databases. If you wish to to use the SQL
- module for development, you should install the libqt4-dev package.
+ The QtSql module helps you provide seamless database integration to your Qt
+ applications.
+ .
+ It includes support for PostgreSQL, MySQL, and SQLite databases. If you wish
+ to to use the SQL module for development, you should install the libqt4-dev
+ package.
+Package: libqt4-svg
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 SVG module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtSvg module provides classes for displaying the contents of SVG files.
+ .
+ Scalable Vector Graphics (SVG) is a language for describing two-dimensional
+ graphics and graphical applications in XML.
+
+Package: libqt4-webkit
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 WebKit module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ QtWebKit provides a Web browser engine that makes it easy to embed content
+ from the World Wide Web into your Qt application.
+
+Package: libqt4-xml
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 XML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtXml module provides a stream reader and writer for XML documents,
+ and C++ implementations of SAX and DOM.
+
+Package: libqt4-xmlpatterns
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 XML patterns module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+
Package: libqt4-dbus
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libqt4-core (<< 4.4.0~tp1-1)
Description: Qt 4 D-Bus module
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This package contains the D-Bus module for Qt.
- .
The QtDBus module is a Unix-only library that you can use to make Inter-Process
Communication using the D-Bus protocol.
.
@@ -88,28 +153,70 @@
applications by exporting objects, as well as use services exported by those
applications by placing calls and accessing properties.
-Package: libqt4-webkit
+Package: libqt4-qt3support
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 WebKit module
+Replaces: libqt4-gui (<< 4.2.1-1)
+Description: Qt 3 compatibility library for Qt 4
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This package contains the WebKit module for Qt.
+ The Qt3Support module provides classes that ease porting from Qt 3 to Qt 4.
+ .
+ It allows applications designed to use deprecated Qt 3 classes and functions
+ to work with Qt 4, with help from the qt3to4 porting tool found in the
+ libqt4-dev package.
-Package: libqt4-xmlpatterns
+Package: libqt4-designer
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 XML patterns module
+Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Description: Qt 4 designer module
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This package contains the XmlPatterns module for Qt.
+ The QtDesigner module provides classes that allow you to create your own
+ custom widget plugins for Qt Designer, and classes that enable you to access
+ Qt Designer's components.
+
+Package: libqt4-help
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Description: Qt 4 help module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
.
- QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+ The QtHelp module provides classes for integrating online documentation in
+ applications.
+Package: libqt4-assistant
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Description: Qt 4 assistant module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtAssistant module provides a means of launching Qt Assistant to provide
+ online help.
+
+Package: libqt4-test
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Description: Qt 4 test module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtTest module provides classes for unit testing Qt applications and
+ libraries.
+
Package: libqt4-dev
Architecture: any
Section: libdevel
@@ -128,17 +235,17 @@
Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
Suggests: qt4-dev-tools, qt4-doc
Description: Qt 4 development files
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This packages contains the header development files and development
- programs such as qmake used for building Qt4 applications.
+ This packages contains the header development files and development programs
+ such as qmake used for building Qt4 applications.
Package: libqt4-debug
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui (= ${binary:Version})
Description: Qt 4 library debugging symbols
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
This packages contains the debugging symbols for the Qt 4 libraries.
@@ -150,11 +257,11 @@
Conflicts: libqt4-designer
Replaces: libqt4-designer, qt4-dev-tools (<= 4.0.1-2)
Description: Qt 4 Designer
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- Qt Designer is a tool for designing and building graphical user
- interfaces (GUIs) from Qt components.
+ Qt Designer is a tool for designing and building graphical user interfaces
+ (GUIs) from Qt components.
Package: qt4-dev-tools
Architecture: any
@@ -163,11 +270,11 @@
Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
Recommends: libqt4-dev, qt4-doc, qt4-designer
Description: Qt 4 development tools
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This packages contains tools used to assist in Qt 4 development,
- including the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications.
+ This packages contains tools used to assist in Qt 4 development, including
+ the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications.
Package: qt4-qtconfig
Architecture: any
@@ -176,7 +283,7 @@
Replaces: libqt4-gui (<< 4.1.0)
Conflicts: qt3-qtconfig (<= 3:3.3.4-7)
Description: Qt 4 configuration tool
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
The Qt Configuration program allows endusers to configure the look and
@@ -188,11 +295,12 @@
Depends: ${misc:Depends}
Suggests: w3m | www-browser, libqt4-dev, qt4-dev-tools
Description: Qt 4 API documentation
- Qt is a cross-platform C++ application framework. Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This package contains the complete Qt 4 API documentation. The
- documentation is provided in HTML and manpage format; the HTML version
- can be viewed in conjunction with the Qt Assistant found in the
- qt4-dev-tools package.
+ This package contains the complete Qt 4 API documentation.
+ .
+ The documentation is provided in HTML and manpage format; the HTML version can
+ be viewed in conjunction with the Qt Assistant found in the qt4-dev-tools
+ package.
Added: branches/qt4-x11/debian/libqt4-assistant.install
===================================================================
--- branches/qt4-x11/debian/libqt4-assistant.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-assistant.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,2 @@
+usr/lib/libQtAssistantClient.so.*
+
Modified: branches/qt4-x11/debian/libqt4-core.install
===================================================================
--- branches/qt4-x11/debian/libqt4-core.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/libqt4-core.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1,7 +1,5 @@
usr/lib/libQtCore.so.*
-usr/lib/libQtNetwork.so.*
-usr/lib/libQtXml.so.*
-usr/lib/libQtTest.so.*
-usr/lib/libQtScript.so.*
usr/lib/libQtCLucene.so.*
+usr/lib/qt4/plugins/codecs/*.so
usr/share/qt4/translations/*.qm
+
Modified: branches/qt4-x11/debian/libqt4-dbus.install
===================================================================
--- branches/qt4-x11/debian/libqt4-dbus.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/libqt4-dbus.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1,2 +1,3 @@
usr/lib/libQtDBus.so.*
usr/bin/qdbus
+
Added: branches/qt4-x11/debian/libqt4-designer.install
===================================================================
--- branches/qt4-x11/debian/libqt4-designer.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-designer.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,3 @@
+usr/lib/libQtDesigner.so.*
+usr/lib/libQtDesignerComponents.so.*
+
Modified: branches/qt4-x11/debian/libqt4-gui.install
===================================================================
--- branches/qt4-x11/debian/libqt4-gui.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/libqt4-gui.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1,13 +1,9 @@
usr/lib/libQtGui.so.*
-usr/lib/libQtOpenGL.so.*
-usr/lib/libQtSvg.so.*
-usr/lib/libQtDesigner.so.*
-usr/lib/libQtDesignerComponents.so.*
-usr/lib/libQtAssistantClient.so.*
-usr/lib/libQtHelp.so.*
usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
-usr/lib/qt4/plugins/codecs/*.so
-usr/lib/qt4/plugins/iconengines/libqsvgicon.so
-usr/lib/qt4/plugins/imageformats/*.so
+usr/lib/qt4/plugins/imageformats/libqgif.so
+usr/lib/qt4/plugins/imageformats/libqico.so
+usr/lib/qt4/plugins/imageformats/libqjpeg.so
+usr/lib/qt4/plugins/imageformats/libqmng.so
+usr/lib/qt4/plugins/imageformats/libqtiff.so
usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
-usr/lib/qt4/plugins/script/libqtscriptdbus.so
+
Added: branches/qt4-x11/debian/libqt4-help.install
===================================================================
--- branches/qt4-x11/debian/libqt4-help.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-help.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,2 @@
+usr/lib/libQtHelp.so.*
+
Added: branches/qt4-x11/debian/libqt4-network.install
===================================================================
--- branches/qt4-x11/debian/libqt4-network.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-network.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,2 @@
+usr/lib/libQtNetwork.so.*
+
Added: branches/qt4-x11/debian/libqt4-opengl.install
===================================================================
--- branches/qt4-x11/debian/libqt4-opengl.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-opengl.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1 @@
+usr/lib/libQtOpenGL.so.*
Modified: branches/qt4-x11/debian/libqt4-qt3support.install
===================================================================
--- branches/qt4-x11/debian/libqt4-qt3support.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/libqt4-qt3support.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1,2 +1,4 @@
usr/lib/libQt3Support.so.*
usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
+
Added: branches/qt4-x11/debian/libqt4-script.install
===================================================================
--- branches/qt4-x11/debian/libqt4-script.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-script.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,3 @@
+usr/lib/libQtScript.so.*
+usr/lib/qt4/plugins/script/libqtscriptdbus.so
+
Modified: branches/qt4-x11/debian/libqt4-sql.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/libqt4-sql.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1,2 +1,4 @@
usr/lib/libQtSql.so.*
-usr/lib/qt4/plugins/sqldrivers/*.so
+usr/lib/qt4/plugins/sqldrivers/libqslibase.so
+usr/lib/qt4/plugins/sqldrivers/libqslodbs.so
+
Added: branches/qt4-x11/debian/libqt4-svg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-svg.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-svg.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,4 @@
+usr/lib/libQtSvg.so.*
+usr/lib/qt4/plugins/iconengines/libqsvgicon.so
+usr/lib/qt4/plugins/imageformats/libqsvg.so
+
Added: branches/qt4-x11/debian/libqt4-test.install
===================================================================
--- branches/qt4-x11/debian/libqt4-test.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-test.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,2 @@
+usr/lib/libQtTest.so.*
+
Modified: branches/qt4-x11/debian/libqt4-webkit.install
===================================================================
--- branches/qt4-x11/debian/libqt4-webkit.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/libqt4-webkit.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1 +1,2 @@
usr/lib/libQtWebKit.so.*
+usr/lib/qt4/plugins/designer/libqwebview.so
Added: branches/qt4-x11/debian/libqt4-xml.install
===================================================================
--- branches/qt4-x11/debian/libqt4-xml.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-xml.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1 @@
+usr/lib/libQtXml.so.*
Added: branches/qt4-x11/debian/patches/0217-qurl-isempty-regression.diff
===================================================================
--- branches/qt4-x11/debian/patches/0217-qurl-isempty-regression.diff (rev 0)
+++ branches/qt4-x11/debian/patches/0217-qurl-isempty-regression.diff 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,28 @@
+qt-bugs@ issue : N199952
+Trolltech task ID : 199967
+applied: yes
+author: Thiago
+
+--- a/src/corelib/io/qurl.cpp
++++ b/src/corelib/io/qurl.cpp
+@@ -3805,14 +3805,14 @@
+ if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed))
+ return d->encodedOriginal.isEmpty();
+ else
+- return d->scheme.isEmpty()
+- && d->userName.isEmpty()
+- && d->password.isEmpty()
+- && d->host.isEmpty()
++ return d->scheme.isEmpty() // no encodedScheme
++ && d->userName.isEmpty() && d->encodedUserName.isEmpty()
++ && d->password.isEmpty() && d->encodedPassword.isEmpty()
++ && d->host.isEmpty() // no encodedHost
+ && d->port == -1
+- && d->path.isEmpty()
++ && d->path.isEmpty() && d->encodedPath.isEmpty()
+ && d->query.isEmpty()
+- && d->fragment.isEmpty();
++ && d->fragment.isEmpty() && d->encodedFragment.isEmpty();
+ }
+
+ /*!
Added: branches/qt4-x11/debian/patches/0218-qassert-macro-fix.diff
===================================================================
--- branches/qt4-x11/debian/patches/0218-qassert-macro-fix.diff (rev 0)
+++ branches/qt4-x11/debian/patches/0218-qassert-macro-fix.diff 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,25 @@
+qt-bugs@ issue :
+Trolltech task ID : 199635
+applied: yes
+author: Trolltech
+
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -1419,7 +1419,7 @@
+
+ #if !defined(Q_ASSERT)
+ # ifndef QT_NO_DEBUG
+-# define Q_ASSERT(cond) if(!(cond))qt_assert(#cond,__FILE__,__LINE__)
++# define Q_ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop())
+ # else
+ # define Q_ASSERT(cond) qt_noop()
+ # endif
+@@ -1433,7 +1433,7 @@
+
+ #if !defined(Q_ASSERT_X)
+ # ifndef QT_NO_DEBUG
+-# define Q_ASSERT_X(cond, where, what) if(!(cond))qt_assert_x(where, what,__FILE__,__LINE__)
++# define Q_ASSERT_X(cond, where, what) ((!(cond)) ? qt_assert_x(where, what,__FILE__,__LINE__) : qt_noop())
+ # else
+ # define Q_ASSERT_X(cond, where, what) qt_noop()
+ # endif
Added: branches/qt4-x11/debian/patches/fix-qt_bootstrapped-typo.diff
===================================================================
--- branches/qt4-x11/debian/patches/fix-qt_bootstrapped-typo.diff (rev 0)
+++ branches/qt4-x11/debian/patches/fix-qt_bootstrapped-typo.diff 2008-03-06 22:05:25 UTC (rev 9662)
@@ -0,0 +1,11 @@
+--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
++++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
+@@ -56,7 +56,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
+-#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAP)
++#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED)
+ # include <sys/times.h>
+ #endif
+
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/patches/series 2008-03-06 22:05:25 UTC (rev 9662)
@@ -12,6 +12,9 @@
0214-fix-qgraphicsproxywidget-tab-crash.diff
0215-compile-with-Xcursor-linkage.diff
0216-allow-isystem-for-headers.diff
+fix-qt_bootstrapped-typo.diff
+0217-qurl-isempty-regression.diff
+0218-qassert-macro-fix.diff
# debian patches
01_qmake_for_debian.diff
Modified: branches/qt4-x11/debian/qt4-designer.install
===================================================================
--- branches/qt4-x11/debian/qt4-designer.install 2008-03-06 20:58:42 UTC (rev 9661)
+++ branches/qt4-x11/debian/qt4-designer.install 2008-03-06 22:05:25 UTC (rev 9662)
@@ -1,2 +1 @@
usr/bin/designer-qt4
-usr/lib/qt4/plugins/designer/*.so
More information about the pkg-kde-commits
mailing list