diff options
48 files changed, 816 insertions, 667 deletions
diff --git a/debian/changelog b/debian/changelog index 2ad979c..9daab44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,19 @@ -qt4-x11 (4:4.5.3-0r1) UNRELEASED; urgency=low +qt4-x11 (4:4.6.0~~tp1+git1336+gc5c58c2-0fabo1) experimental-snapshot; urgency=low + + * New release from 4.6-stable git branch. + * Refresh qt-copy patches: 0180 and 209. + * Remove qt-copy patches: 0255, 0274, 0280 and 0287. + * Refresh Debian patches: 01, 05, 09, 11, 16, 18, 19, 30, 40, 41, 50 and 81. + * Remove Debian patches: + - 14_add_libraries_to_gui_build_where_actually_needed - fixed upstream. + * Update debian/control: + - Add libasound2-dev build dependency. + - Add libqt4-multimedia package. + * Update installed files and related lintian files. + + -- Fathi Boudra <fabo@debian.org> Sun, 04 Oct 2009 21:53:47 +0200 + +qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low * New upstream release: - Fix CVE-2009-2700 - QSSlCertificate incorrect verification of SSL @@ -44,7 +59,7 @@ qt4-x11 (4:4.5.3-0r1) UNRELEASED; urgency=low * Update debian/copyright: - Update Nokia Qt url. - Update Nokia Qt LGPL Exception from version 1.0 to version 1.1. - * Update *.install and *.lintian files. + * Update *.install files and *.lintian files. * Update debian/rules: - Build translations - Generate include directory before configure call. diff --git a/debian/control b/debian/control index 57e95d8..ef78fdb 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Brian Nelson <pyro@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Modestas Vainius <modestas@vainius.eu> Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-kde-tools (>= 0.4), flex, sharutils, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc], - libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev, + libasound2-dev, libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev, libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg62-dev, libmng-dev, libmysqlclient-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev, @@ -334,6 +334,16 @@ Description: Qt 4 test module The QtTest module provides classes for unit testing Qt applications and libraries. +Package: libqt4-multimedia +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Qt 4 Multimedia 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 Qt Multimedia module provides low-level multimedia functionality. + Package: libphonon4 Architecture: any Section: libs @@ -357,8 +367,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}), - libqt4-test (= ${binary:Version}), libphonon4 (= ${binary:Version}), - qt4-qmake (= ${binary:Version}) + libqt4-test (= ${binary:Version}), libqt4-multimedia (= ${binary:Version}), + libphonon4 (= ${binary:Version}), qt4-qmake (= ${binary:Version}) Recommends: libqt4-opengl-dev (= ${binary:Version}) Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2) diff --git a/debian/libqt4-dbg.install b/debian/libqt4-dbg.install index 71daafb..f5f2744 100644 --- a/debian/libqt4-dbg.install +++ b/debian/libqt4-dbg.install @@ -7,6 +7,7 @@ usr/lib/libQtDesigner.so.*.debug usr/lib/libQtDesignerComponents.so.*.debug usr/lib/libQtGui.so.*.debug usr/lib/libQtHelp.so.*.debug +usr/lib/libQtMultimedia.so.*.debug usr/lib/libQtNetwork.so.*.debug usr/lib/libQtOpenGL.so.*.debug usr/lib/libQtScript.so.*.debug @@ -22,6 +23,7 @@ usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so.debug +usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so.debug usr/lib/qt4/plugins/iconengines/libqsvgicon.so.debug usr/lib/qt4/plugins/imageformats/libqgif.so.debug usr/lib/qt4/plugins/imageformats/libqico.so.debug diff --git a/debian/libqt4-dbg.lintian b/debian/libqt4-dbg.lintian index 2ef789c..e92e9b3 100644 --- a/debian/libqt4-dbg.lintian +++ b/debian/libqt4-dbg.lintian @@ -1,20 +1,21 @@ -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCLucene.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtHelp.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScriptTools.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.5.3.debug -libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.5.3.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCLucene.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtHelp.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtMultimedia.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScriptTools.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.6.0.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.6.0.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug @@ -22,6 +23,7 @@ libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqjpcod libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so.debug +libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/iconengines/libqsvgicon.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqico.so.debug @@ -37,23 +39,24 @@ libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqs libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so.debug libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCLucene.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtHelp.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScriptTools.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.5.3.debug -libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.5.3.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCLucene.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtHelp.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtMultimedia.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScriptTools.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.6.0.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.6.0.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug @@ -61,6 +64,7 @@ libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/code libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so.debug +libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/iconengines/libqsvgicon.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqico.so.debug @@ -76,20 +80,21 @@ libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqld libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so.debug libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQt3Support.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtAssistantClient.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCLucene.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCore.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDBus.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesigner.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesignerComponents.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtGui.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtHelp.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtNetwork.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtOpenGL.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScript.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScriptTools.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSql.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSvg.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtTest.so.4.5.3.debug -libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXml.so.4.5.3.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQt3Support.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtAssistantClient.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCLucene.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCore.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDBus.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesigner.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesignerComponents.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtGui.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtHelp.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtMultimedia.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtNetwork.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtOpenGL.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScript.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScriptTools.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSql.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSvg.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtTest.so.4.6.0.debug +libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXml.so.4.6.0.debug diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install index bde5e8d..8f8a7de 100644 --- a/debian/libqt4-dev.install +++ b/debian/libqt4-dev.install @@ -12,6 +12,7 @@ usr/include/qt4/Qt/QtCore usr/include/qt4/Qt/QtDBus usr/include/qt4/Qt/QtGui usr/include/qt4/Qt/QtHelp +usr/include/qt4/Qt/QtMultimedia usr/include/qt4/Qt/QtNetwork usr/include/qt4/Qt/QtScript usr/include/qt4/Qt/QtScriptTools @@ -128,9 +129,11 @@ usr/include/qt4/Qt/q3vgroupbox.h usr/include/qt4/Qt/q3whatsthis.h usr/include/qt4/Qt/q3widgetstack.h usr/include/qt4/Qt/q3wizard.h +usr/include/qt4/Qt/qabstractanimation.h usr/include/qt4/Qt/qabstractbutton.h usr/include/qt4/Qt/qabstracteventdispatcher.h usr/include/qt4/Qt/qabstractfileengine.h +usr/include/qt4/Qt/qabstractfontengine_qws.h usr/include/qt4/Qt/qabstractitemdelegate.h usr/include/qt4/Qt/qabstractitemmodel.h usr/include/qt4/Qt/qabstractitemview.h @@ -143,8 +146,12 @@ usr/include/qt4/Qt/qabstractscrollarea.h usr/include/qt4/Qt/qabstractslider.h usr/include/qt4/Qt/qabstractsocket.h usr/include/qt4/Qt/qabstractspinbox.h +usr/include/qt4/Qt/qabstractstate.h usr/include/qt4/Qt/qabstracttextdocumentlayout.h +usr/include/qt4/Qt/qabstracttransition.h usr/include/qt4/Qt/qabstracturiresolver.h +usr/include/qt4/Qt/qabstractvideobuffer.h +usr/include/qt4/Qt/qabstractvideosurface.h usr/include/qt4/Qt/qabstractxmlnodemodel.h usr/include/qt4/Qt/qabstractxmlreceiver.h usr/include/qt4/Qt/qaccessible.h @@ -156,6 +163,7 @@ usr/include/qt4/Qt/qaccessiblewidget.h usr/include/qt4/Qt/qaction.h usr/include/qt4/Qt/qactiongroup.h usr/include/qt4/Qt/qalgorithms.h +usr/include/qt4/Qt/qanimationgroup.h usr/include/qt4/Qt/qapplication.h usr/include/qt4/Qt/qatomic.h usr/include/qt4/Qt/qatomic_alpha.h @@ -168,6 +176,7 @@ usr/include/qt4/Qt/qatomic_bootstrap.h usr/include/qt4/Qt/qatomic_generic.h usr/include/qt4/Qt/qatomic_i386.h usr/include/qt4/Qt/qatomic_ia64.h +usr/include/qt4/Qt/qatomic_macosx.h usr/include/qt4/Qt/qatomic_mips.h usr/include/qt4/Qt/qatomic_parisc.h usr/include/qt4/Qt/qatomic_powerpc.h @@ -175,7 +184,18 @@ usr/include/qt4/Qt/qatomic_s390.h usr/include/qt4/Qt/qatomic_sh.h usr/include/qt4/Qt/qatomic_sh4a.h usr/include/qt4/Qt/qatomic_sparc.h +usr/include/qt4/Qt/qatomic_symbian.h +usr/include/qt4/Qt/qatomic_vxworks.h +usr/include/qt4/Qt/qatomic_windows.h +usr/include/qt4/Qt/qatomic_windowsce.h usr/include/qt4/Qt/qatomic_x86_64.h +usr/include/qt4/Qt/qaudio.h +usr/include/qt4/Qt/qaudiodeviceinfo.h +usr/include/qt4/Qt/qaudioengine.h +usr/include/qt4/Qt/qaudioengineplugin.h +usr/include/qt4/Qt/qaudioformat.h +usr/include/qt4/Qt/qaudioinput.h +usr/include/qt4/Qt/qaudiooutput.h usr/include/qt4/Qt/qauthenticator.h usr/include/qt4/Qt/qbasicatomic.h usr/include/qt4/Qt/qbasictimer.h @@ -210,6 +230,8 @@ usr/include/qt4/Qt/qconfig-minimal.h usr/include/qt4/Qt/qconfig-small.h usr/include/qt4/Qt/qconfig.h usr/include/qt4/Qt/qcontainerfwd.h +usr/include/qt4/Qt/qcontiguouscache.h +usr/include/qt4/Qt/qcopchannel_qws.h usr/include/qt4/Qt/qcoreapplication.h usr/include/qt4/Qt/qcoreevent.h usr/include/qt4/Qt/qcryptographichash.h @@ -235,22 +257,31 @@ usr/include/qt4/Qt/qdbuspendingreply.h usr/include/qt4/Qt/qdbusreply.h usr/include/qt4/Qt/qdbusserver.h usr/include/qt4/Qt/qdebug.h +usr/include/qt4/Qt/qdecoration_qws.h +usr/include/qt4/Qt/qdecorationdefault_qws.h +usr/include/qt4/Qt/qdecorationfactory_qws.h +usr/include/qt4/Qt/qdecorationplugin_qws.h +usr/include/qt4/Qt/qdecorationstyled_qws.h +usr/include/qt4/Qt/qdecorationwindows_qws.h usr/include/qt4/Qt/qdesktopservices.h usr/include/qt4/Qt/qdesktopwidget.h usr/include/qt4/Qt/qdial.h usr/include/qt4/Qt/qdialog.h usr/include/qt4/Qt/qdialogbuttonbox.h usr/include/qt4/Qt/qdir.h +usr/include/qt4/Qt/qdirectpainter_qws.h usr/include/qt4/Qt/qdiriterator.h usr/include/qt4/Qt/qdirmodel.h usr/include/qt4/Qt/qdockwidget.h usr/include/qt4/Qt/qdom.h usr/include/qt4/Qt/qdrag.h usr/include/qt4/Qt/qdrawutil.h +usr/include/qt4/Qt/qeasingcurve.h usr/include/qt4/Qt/qendian.h usr/include/qt4/Qt/qerrormessage.h usr/include/qt4/Qt/qevent.h usr/include/qt4/Qt/qeventloop.h +usr/include/qt4/Qt/qeventtransition.h usr/include/qt4/Qt/qfactoryinterface.h usr/include/qt4/Qt/qfeatures.h usr/include/qt4/Qt/qfile.h @@ -259,6 +290,7 @@ usr/include/qt4/Qt/qfileiconprovider.h usr/include/qt4/Qt/qfileinfo.h usr/include/qt4/Qt/qfilesystemmodel.h usr/include/qt4/Qt/qfilesystemwatcher.h +usr/include/qt4/Qt/qfinalstate.h usr/include/qt4/Qt/qfocusframe.h usr/include/qt4/Qt/qfont.h usr/include/qt4/Qt/qfontcombobox.h @@ -270,11 +302,17 @@ usr/include/qt4/Qt/qformlayout.h usr/include/qt4/Qt/qframe.h usr/include/qt4/Qt/qfsfileengine.h usr/include/qt4/Qt/qftp.h +usr/include/qt4/Qt/qfunctions_vxworks.h +usr/include/qt4/Qt/qfunctions_wince.h usr/include/qt4/Qt/qfuture.h usr/include/qt4/Qt/qfutureinterface.h usr/include/qt4/Qt/qfuturesynchronizer.h usr/include/qt4/Qt/qfuturewatcher.h +usr/include/qt4/Qt/qgenericmatrix.h +usr/include/qt4/Qt/qgesture.h usr/include/qt4/Qt/qglobal.h +usr/include/qt4/Qt/qgraphicsanchorlayout.h +usr/include/qt4/Qt/qgraphicseffect.h usr/include/qt4/Qt/qgraphicsgridlayout.h usr/include/qt4/Qt/qgraphicsitem.h usr/include/qt4/Qt/qgraphicsitemanimation.h @@ -285,11 +323,13 @@ usr/include/qt4/Qt/qgraphicsproxywidget.h usr/include/qt4/Qt/qgraphicsscene.h usr/include/qt4/Qt/qgraphicssceneevent.h usr/include/qt4/Qt/qgraphicssvgitem.h +usr/include/qt4/Qt/qgraphicstransform.h usr/include/qt4/Qt/qgraphicsview.h usr/include/qt4/Qt/qgraphicswidget.h usr/include/qt4/Qt/qgridlayout.h usr/include/qt4/Qt/qgroupbox.h usr/include/qt4/Qt/qgtkstyle.h +usr/include/qt4/Qt/qguifunctions_wince.h usr/include/qt4/Qt/qhash.h usr/include/qt4/Qt/qheaderview.h usr/include/qt4/Qt/qhelp_global.h @@ -300,6 +340,7 @@ usr/include/qt4/Qt/qhelpindexwidget.h usr/include/qt4/Qt/qhelpsearchengine.h usr/include/qt4/Qt/qhelpsearchquerywidget.h usr/include/qt4/Qt/qhelpsearchresultwidget.h +usr/include/qt4/Qt/qhistorystate.h usr/include/qt4/Qt/qhostaddress.h usr/include/qt4/Qt/qhostinfo.h usr/include/qt4/Qt/qhttp.h @@ -320,6 +361,15 @@ usr/include/qt4/Qt/qitemdelegate.h usr/include/qt4/Qt/qitemeditorfactory.h usr/include/qt4/Qt/qitemselectionmodel.h usr/include/qt4/Qt/qiterator.h +usr/include/qt4/Qt/qkbd_qws.h +usr/include/qt4/Qt/qkbddriverfactory_qws.h +usr/include/qt4/Qt/qkbddriverplugin_qws.h +usr/include/qt4/Qt/qkbdlinuxinput_qws.h +usr/include/qt4/Qt/qkbdqnx_qws.h +usr/include/qt4/Qt/qkbdtty_qws.h +usr/include/qt4/Qt/qkbdum_qws.h +usr/include/qt4/Qt/qkbdvfb_qws.h +usr/include/qt4/Qt/qkeyeventtransition.h usr/include/qt4/Qt/qkeysequence.h usr/include/qt4/Qt/qlabel.h usr/include/qt4/Qt/qlayout.h @@ -336,10 +386,16 @@ usr/include/qt4/Qt/qlistwidget.h usr/include/qt4/Qt/qlocale.h usr/include/qt4/Qt/qlocalserver.h usr/include/qt4/Qt/qlocalsocket.h +usr/include/qt4/Qt/qmaccocoaviewcontainer_mac.h +usr/include/qt4/Qt/qmacdefines_mac.h +usr/include/qt4/Qt/qmacnativewidget_mac.h +usr/include/qt4/Qt/qmacstyle_mac.h usr/include/qt4/Qt/qmainwindow.h usr/include/qt4/Qt/qmap.h +usr/include/qt4/Qt/qmargins.h usr/include/qt4/Qt/qmath.h usr/include/qt4/Qt/qmatrix.h +usr/include/qt4/Qt/qmatrix4x4.h usr/include/qt4/Qt/qmdiarea.h usr/include/qt4/Qt/qmdisubwindow.h usr/include/qt4/Qt/qmenu.h @@ -351,11 +407,22 @@ usr/include/qt4/Qt/qmetatype.h usr/include/qt4/Qt/qmime.h usr/include/qt4/Qt/qmimedata.h usr/include/qt4/Qt/qmotifstyle.h +usr/include/qt4/Qt/qmouse_qws.h +usr/include/qt4/Qt/qmousedriverfactory_qws.h +usr/include/qt4/Qt/qmousedriverplugin_qws.h +usr/include/qt4/Qt/qmouseeventtransition.h +usr/include/qt4/Qt/qmouselinuxinput_qws.h +usr/include/qt4/Qt/qmouselinuxtp_qws.h +usr/include/qt4/Qt/qmousepc_qws.h +usr/include/qt4/Qt/qmouseqnx_qws.h +usr/include/qt4/Qt/qmousetslib_qws.h +usr/include/qt4/Qt/qmousevfb_qws.h usr/include/qt4/Qt/qmovie.h usr/include/qt4/Qt/qmutex.h usr/include/qt4/Qt/qnamespace.h usr/include/qt4/Qt/qnetworkaccessmanager.h usr/include/qt4/Qt/qnetworkcookie.h +usr/include/qt4/Qt/qnetworkcookiejar.h usr/include/qt4/Qt/qnetworkdiskcache.h usr/include/qt4/Qt/qnetworkinterface.h usr/include/qt4/Qt/qnetworkproxy.h @@ -372,6 +439,8 @@ usr/include/qt4/Qt/qpainter.h usr/include/qt4/Qt/qpainterpath.h usr/include/qt4/Qt/qpair.h usr/include/qt4/Qt/qpalette.h +usr/include/qt4/Qt/qparallelanimationgroup.h +usr/include/qt4/Qt/qpauseanimation.h usr/include/qt4/Qt/qpen.h usr/include/qt4/Qt/qpicture.h usr/include/qt4/Qt/qpictureformatplugin.h @@ -393,8 +462,11 @@ usr/include/qt4/Qt/qprintpreviewwidget.h usr/include/qt4/Qt/qprocess.h usr/include/qt4/Qt/qprogressbar.h usr/include/qt4/Qt/qprogressdialog.h +usr/include/qt4/Qt/qpropertyanimation.h usr/include/qt4/Qt/qproxymodel.h +usr/include/qt4/Qt/qproxystyle.h usr/include/qt4/Qt/qpushbutton.h +usr/include/qt4/Qt/qquaternion.h usr/include/qt4/Qt/qqueue.h usr/include/qt4/Qt/qradiobutton.h usr/include/qt4/Qt/qreadwritelock.h @@ -405,6 +477,19 @@ usr/include/qt4/Qt/qresource.h usr/include/qt4/Qt/qrgb.h usr/include/qt4/Qt/qrubberband.h usr/include/qt4/Qt/qrunnable.h +usr/include/qt4/Qt/qs60mainapplication.h +usr/include/qt4/Qt/qs60mainappui.h +usr/include/qt4/Qt/qs60maindocument.h +usr/include/qt4/Qt/qs60style.h +usr/include/qt4/Qt/qscopedpointer.h +usr/include/qt4/Qt/qscreen_qws.h +usr/include/qt4/Qt/qscreendriverfactory_qws.h +usr/include/qt4/Qt/qscreendriverplugin_qws.h +usr/include/qt4/Qt/qscreenlinuxfb_qws.h +usr/include/qt4/Qt/qscreenproxy_qws.h +usr/include/qt4/Qt/qscreenqnx_qws.h +usr/include/qt4/Qt/qscreentransformed_qws.h +usr/include/qt4/Qt/qscreenvfb_qws.h usr/include/qt4/Qt/qscriptable.h usr/include/qt4/Qt/qscriptclass.h usr/include/qt4/Qt/qscriptclasspropertyiterator.h @@ -421,6 +506,7 @@ usr/include/qt4/Qt/qscriptvalueiterator.h usr/include/qt4/Qt/qscrollarea.h usr/include/qt4/Qt/qscrollbar.h usr/include/qt4/Qt/qsemaphore.h +usr/include/qt4/Qt/qsequentialanimationgroup.h usr/include/qt4/Qt/qsessionmanager.h usr/include/qt4/Qt/qset.h usr/include/qt4/Qt/qsettings.h @@ -431,6 +517,7 @@ usr/include/qt4/Qt/qsharedpointer_impl.h usr/include/qt4/Qt/qshortcut.h usr/include/qt4/Qt/qsignalmapper.h usr/include/qt4/Qt/qsignalspy.h +usr/include/qt4/Qt/qsignaltransition.h usr/include/qt4/Qt/qsimplexmlnodemodel.h usr/include/qt4/Qt/qsize.h usr/include/qt4/Qt/qsizegrip.h @@ -439,6 +526,7 @@ usr/include/qt4/Qt/qslider.h usr/include/qt4/Qt/qsocketnotifier.h usr/include/qt4/Qt/qsortfilterproxymodel.h usr/include/qt4/Qt/qsound.h +usr/include/qt4/Qt/qsoundqss_qws.h usr/include/qt4/Qt/qsourcelocation.h usr/include/qt4/Qt/qspinbox.h usr/include/qt4/Qt/qsplashscreen.h @@ -476,9 +564,13 @@ usr/include/qt4/Qt/qsslsocket.h usr/include/qt4/Qt/qstack.h usr/include/qt4/Qt/qstackedlayout.h usr/include/qt4/Qt/qstackedwidget.h +usr/include/qt4/Qt/qstandardgestures.h usr/include/qt4/Qt/qstandarditemmodel.h +usr/include/qt4/Qt/qstate.h +usr/include/qt4/Qt/qstatemachine.h usr/include/qt4/Qt/qstatusbar.h usr/include/qt4/Qt/qstring.h +usr/include/qt4/Qt/qstringbuilder.h usr/include/qt4/Qt/qstringlist.h usr/include/qt4/Qt/qstringlistmodel.h usr/include/qt4/Qt/qstringmatcher.h @@ -494,6 +586,7 @@ usr/include/qt4/Qt/qsvgwidget.h usr/include/qt4/Qt/qsyntaxhighlighter.h usr/include/qt4/Qt/qsystemsemaphore.h usr/include/qt4/Qt/qsystemtrayicon.h +usr/include/qt4/Qt/qt_windows.h usr/include/qt4/Qt/qtabbar.h usr/include/qt4/Qt/qtableview.h usr/include/qt4/Qt/qtablewidget.h @@ -521,14 +614,24 @@ usr/include/qt4/Qt/qtest_global.h usr/include/qt4/Qt/qtest_gui.h usr/include/qt4/Qt/qtestaccessible.h usr/include/qt4/Qt/qtestassert.h +usr/include/qt4/Qt/qtestbasicstreamer.h usr/include/qt4/Qt/qtestcase.h +usr/include/qt4/Qt/qtestcoreelement.h +usr/include/qt4/Qt/qtestcorelist.h usr/include/qt4/Qt/qtestdata.h +usr/include/qt4/Qt/qtestelement.h +usr/include/qt4/Qt/qtestelementattribute.h usr/include/qt4/Qt/qtestevent.h usr/include/qt4/Qt/qtesteventloop.h +usr/include/qt4/Qt/qtestfilelogger.h usr/include/qt4/Qt/qtestkeyboard.h +usr/include/qt4/Qt/qtestlightxmlstreamer.h usr/include/qt4/Qt/qtestmouse.h usr/include/qt4/Qt/qtestspontaneevent.h usr/include/qt4/Qt/qtestsystem.h +usr/include/qt4/Qt/qtesttouch.h +usr/include/qt4/Qt/qtestxmlstreamer.h +usr/include/qt4/Qt/qtestxunitstreamer.h usr/include/qt4/Qt/qtextboundaryfinder.h usr/include/qt4/Qt/qtextbrowser.h usr/include/qt4/Qt/qtextcodec.h @@ -556,6 +659,8 @@ usr/include/qt4/Qt/qtoolbutton.h usr/include/qt4/Qt/qtooltip.h usr/include/qt4/Qt/qtransform.h usr/include/qt4/Qt/qtranslator.h +usr/include/qt4/Qt/qtransportauth_qws.h +usr/include/qt4/Qt/qtransportauthdefs_qws.h usr/include/qt4/Qt/qtreeview.h usr/include/qt4/Qt/qtreewidget.h usr/include/qt4/Qt/qtreewidgetitemiterator.h @@ -568,15 +673,27 @@ usr/include/qt4/Qt/qurlinfo.h usr/include/qt4/Qt/quuid.h usr/include/qt4/Qt/qvalidator.h usr/include/qt4/Qt/qvariant.h +usr/include/qt4/Qt/qvariantanimation.h usr/include/qt4/Qt/qvarlengtharray.h usr/include/qt4/Qt/qvector.h +usr/include/qt4/Qt/qvector2d.h +usr/include/qt4/Qt/qvector3d.h +usr/include/qt4/Qt/qvector4d.h +usr/include/qt4/Qt/qvfbhdr.h +usr/include/qt4/Qt/qvideoframe.h +usr/include/qt4/Qt/qvideosurfaceformat.h usr/include/qt4/Qt/qwaitcondition.h usr/include/qt4/Qt/qwebdatabase.h +usr/include/qt4/Qt/qwebelement.h usr/include/qt4/Qt/qwebframe.h +usr/include/qt4/Qt/qwebgraphicsitem.h usr/include/qt4/Qt/qwebhistory.h usr/include/qt4/Qt/qwebhistoryinterface.h +usr/include/qt4/Qt/qwebinspector.h usr/include/qt4/Qt/qwebkitglobal.h +usr/include/qt4/Qt/qwebkitversion.h usr/include/qt4/Qt/qwebpage.h +usr/include/qt4/Qt/qwebplugindatabase.h usr/include/qt4/Qt/qwebpluginfactory.h usr/include/qt4/Qt/qwebsecurityorigin.h usr/include/qt4/Qt/qwebsettings.h @@ -585,14 +702,25 @@ usr/include/qt4/Qt/qwhatsthis.h usr/include/qt4/Qt/qwidget.h usr/include/qt4/Qt/qwidgetaction.h usr/include/qt4/Qt/qwindowdefs.h +usr/include/qt4/Qt/qwindowdefs_win.h usr/include/qt4/Qt/qwindowscestyle.h usr/include/qt4/Qt/qwindowsmobilestyle.h usr/include/qt4/Qt/qwindowsstyle.h usr/include/qt4/Qt/qwindowsvistastyle.h usr/include/qt4/Qt/qwindowsxpstyle.h +usr/include/qt4/Qt/qwindowsystem_qws.h usr/include/qt4/Qt/qwizard.h usr/include/qt4/Qt/qwmatrix.h usr/include/qt4/Qt/qworkspace.h +usr/include/qt4/Qt/qwscursor_qws.h +usr/include/qt4/Qt/qwsdisplay_qws.h +usr/include/qt4/Qt/qwsembedwidget.h +usr/include/qt4/Qt/qwsevent_qws.h +usr/include/qt4/Qt/qwsmanager_qws.h +usr/include/qt4/Qt/qwsproperty_qws.h +usr/include/qt4/Qt/qwsprotocolitem_qws.h +usr/include/qt4/Qt/qwssocket_qws.h +usr/include/qt4/Qt/qwsutils_qws.h usr/include/qt4/Qt/qx11embed_x11.h usr/include/qt4/Qt/qx11info_x11.h usr/include/qt4/Qt/qxml.h @@ -601,6 +729,8 @@ usr/include/qt4/Qt/qxmlname.h usr/include/qt4/Qt/qxmlnamepool.h usr/include/qt4/Qt/qxmlquery.h usr/include/qt4/Qt/qxmlresultitems.h +usr/include/qt4/Qt/qxmlschema.h +usr/include/qt4/Qt/qxmlschemavalidator.h usr/include/qt4/Qt/qxmlserializer.h usr/include/qt4/Qt/qxmlstream.h usr/include/qt4/Qt3Support/Q3Accel @@ -901,13 +1031,17 @@ usr/include/qt4/QtAssistant/QAssistantClient usr/include/qt4/QtAssistant/QtAssistant usr/include/qt4/QtAssistant/qassistantclient.h usr/include/qt4/QtAssistant/qassistantclient_global.h +usr/include/qt4/QtCore/QAbstractAnimation usr/include/qt4/QtCore/QAbstractEventDispatcher usr/include/qt4/QtCore/QAbstractFileEngine usr/include/qt4/QtCore/QAbstractFileEngineHandler usr/include/qt4/QtCore/QAbstractFileEngineIterator usr/include/qt4/QtCore/QAbstractItemModel usr/include/qt4/QtCore/QAbstractListModel +usr/include/qt4/QtCore/QAbstractState usr/include/qt4/QtCore/QAbstractTableModel +usr/include/qt4/QtCore/QAbstractTransition +usr/include/qt4/QtCore/QAnimationGroup usr/include/qt4/QtCore/QArgument usr/include/qt4/QtCore/QAtomicInt usr/include/qt4/QtCore/QAtomicPointer @@ -926,10 +1060,15 @@ usr/include/qt4/QtCore/QCache usr/include/qt4/QtCore/QChar usr/include/qt4/QtCore/QCharRef usr/include/qt4/QtCore/QChildEvent +usr/include/qt4/QtCore/QConcatenable usr/include/qt4/QtCore/QConstString +usr/include/qt4/QtCore/QContiguousCache +usr/include/qt4/QtCore/QContiguousCacheData +usr/include/qt4/QtCore/QContiguousCacheTypedData usr/include/qt4/QtCore/QCoreApplication usr/include/qt4/QtCore/QCryptographicHash usr/include/qt4/QtCore/QCustomEvent +usr/include/qt4/QtCore/QCustomScopedPointer usr/include/qt4/QtCore/QDataStream usr/include/qt4/QtCore/QDate usr/include/qt4/QtCore/QDateTime @@ -937,8 +1076,10 @@ usr/include/qt4/QtCore/QDebug usr/include/qt4/QtCore/QDir usr/include/qt4/QtCore/QDirIterator usr/include/qt4/QtCore/QDynamicPropertyChangeEvent +usr/include/qt4/QtCore/QEasingCurve usr/include/qt4/QtCore/QEvent usr/include/qt4/QtCore/QEventLoop +usr/include/qt4/QtCore/QEventTransition usr/include/qt4/QtCore/QExplicitlySharedDataPointer usr/include/qt4/QtCore/QFSFileEngine usr/include/qt4/QtCore/QFactoryInterface @@ -947,6 +1088,7 @@ usr/include/qt4/QtCore/QFileInfo usr/include/qt4/QtCore/QFileInfoList usr/include/qt4/QtCore/QFileInfoListIterator usr/include/qt4/QtCore/QFileSystemWatcher +usr/include/qt4/QtCore/QFinalState usr/include/qt4/QtCore/QFlag usr/include/qt4/QtCore/QFlags usr/include/qt4/QtCore/QForeachContainer @@ -968,12 +1110,13 @@ usr/include/qt4/QtCore/QHashDummyNode usr/include/qt4/QtCore/QHashDummyValue usr/include/qt4/QtCore/QHashIterator usr/include/qt4/QtCore/QHashNode +usr/include/qt4/QtCore/QHistoryState usr/include/qt4/QtCore/QIODevice usr/include/qt4/QtCore/QIncompatibleFlag -usr/include/qt4/QtCore/QIntForSize -usr/include/qt4/QtCore/QIntForType +usr/include/qt4/QtCore/QIntegerForSize usr/include/qt4/QtCore/QInternal usr/include/qt4/QtCore/QLatin1Char +usr/include/qt4/QtCore/QLatin1Literal usr/include/qt4/QtCore/QLatin1String usr/include/qt4/QtCore/QLibrary usr/include/qt4/QtCore/QLibraryInfo @@ -992,10 +1135,12 @@ usr/include/qt4/QtCore/QMapData usr/include/qt4/QtCore/QMapIterator usr/include/qt4/QtCore/QMapNode usr/include/qt4/QtCore/QMapPayloadNode +usr/include/qt4/QtCore/QMargins usr/include/qt4/QtCore/QMetaClassInfo usr/include/qt4/QtCore/QMetaEnum usr/include/qt4/QtCore/QMetaMethod usr/include/qt4/QtCore/QMetaObject +usr/include/qt4/QtCore/QMetaObjectAccessor usr/include/qt4/QtCore/QMetaObjectExtraData usr/include/qt4/QtCore/QMetaProperty usr/include/qt4/QtCore/QMetaType @@ -1024,12 +1169,16 @@ usr/include/qt4/QtCore/QObjectData usr/include/qt4/QtCore/QObjectList usr/include/qt4/QtCore/QObjectUserData usr/include/qt4/QtCore/QPair +usr/include/qt4/QtCore/QParallelAnimationGroup +usr/include/qt4/QtCore/QPauseAnimation usr/include/qt4/QtCore/QPersistentModelIndex usr/include/qt4/QtCore/QPluginLoader usr/include/qt4/QtCore/QPoint usr/include/qt4/QtCore/QPointF usr/include/qt4/QtCore/QPointer usr/include/qt4/QtCore/QProcess +usr/include/qt4/QtCore/QProcessEnvironment +usr/include/qt4/QtCore/QPropertyAnimation usr/include/qt4/QtCore/QQueue usr/include/qt4/QtCore/QReadLocker usr/include/qt4/QtCore/QReadWriteLock @@ -1039,7 +1188,15 @@ usr/include/qt4/QtCore/QRegExp usr/include/qt4/QtCore/QResource usr/include/qt4/QtCore/QReturnArgument usr/include/qt4/QtCore/QRunnable +usr/include/qt4/QtCore/QScopedArrayPointer +usr/include/qt4/QtCore/QScopedPointer +usr/include/qt4/QtCore/QScopedPointerArrayDeleter +usr/include/qt4/QtCore/QScopedPointerDeleter +usr/include/qt4/QtCore/QScopedPointerPodDeleter +usr/include/qt4/QtCore/QScopedPointerSharedDeleter +usr/include/qt4/QtCore/QScopedSharedPointer usr/include/qt4/QtCore/QSemaphore +usr/include/qt4/QtCore/QSequentialAnimationGroup usr/include/qt4/QtCore/QSet usr/include/qt4/QtCore/QSetIterator usr/include/qt4/QtCore/QSettings @@ -1048,12 +1205,16 @@ usr/include/qt4/QtCore/QSharedDataPointer usr/include/qt4/QtCore/QSharedMemory usr/include/qt4/QtCore/QSharedPointer usr/include/qt4/QtCore/QSignalMapper +usr/include/qt4/QtCore/QSignalTransition usr/include/qt4/QtCore/QSize usr/include/qt4/QtCore/QSizeF usr/include/qt4/QtCore/QSocketNotifier usr/include/qt4/QtCore/QStack +usr/include/qt4/QtCore/QState +usr/include/qt4/QtCore/QStateMachine usr/include/qt4/QtCore/QStdWString usr/include/qt4/QtCore/QString +usr/include/qt4/QtCore/QStringBuilder usr/include/qt4/QtCore/QStringList usr/include/qt4/QtCore/QStringListIterator usr/include/qt4/QtCore/QStringMatcher @@ -1084,12 +1245,11 @@ usr/include/qt4/QtCore/QTimer usr/include/qt4/QtCore/QTimerEvent usr/include/qt4/QtCore/QTranslator usr/include/qt4/QtCore/QTypeInfo -usr/include/qt4/QtCore/QUintForSize -usr/include/qt4/QtCore/QUintForType usr/include/qt4/QtCore/QUrl usr/include/qt4/QtCore/QUuid usr/include/qt4/QtCore/QVarLengthArray usr/include/qt4/QtCore/QVariant +usr/include/qt4/QtCore/QVariantAnimation usr/include/qt4/QtCore/QVariantComparisonHelper usr/include/qt4/QtCore/QVariantHash usr/include/qt4/QtCore/QVariantList @@ -1140,10 +1300,14 @@ usr/include/qt4/QtCore/QtGlobal usr/include/qt4/QtCore/QtMsgHandler usr/include/qt4/QtCore/QtPlugin usr/include/qt4/QtCore/QtPluginInstanceFunction +usr/include/qt4/QtCore/qabstractanimation.h usr/include/qt4/QtCore/qabstracteventdispatcher.h usr/include/qt4/QtCore/qabstractfileengine.h usr/include/qt4/QtCore/qabstractitemmodel.h +usr/include/qt4/QtCore/qabstractstate.h +usr/include/qt4/QtCore/qabstracttransition.h usr/include/qt4/QtCore/qalgorithms.h +usr/include/qt4/QtCore/qanimationgroup.h usr/include/qt4/QtCore/qatomic.h usr/include/qt4/QtCore/qatomic_alpha.h usr/include/qt4/QtCore/qatomic_arch.h @@ -1155,6 +1319,7 @@ usr/include/qt4/QtCore/qatomic_bootstrap.h usr/include/qt4/QtCore/qatomic_generic.h usr/include/qt4/QtCore/qatomic_i386.h usr/include/qt4/QtCore/qatomic_ia64.h +usr/include/qt4/QtCore/qatomic_macosx.h usr/include/qt4/QtCore/qatomic_mips.h usr/include/qt4/QtCore/qatomic_parisc.h usr/include/qt4/QtCore/qatomic_powerpc.h @@ -1162,6 +1327,10 @@ usr/include/qt4/QtCore/qatomic_s390.h usr/include/qt4/QtCore/qatomic_sh.h usr/include/qt4/QtCore/qatomic_sh4a.h usr/include/qt4/QtCore/qatomic_sparc.h +usr/include/qt4/QtCore/qatomic_symbian.h +usr/include/qt4/QtCore/qatomic_vxworks.h +usr/include/qt4/QtCore/qatomic_windows.h +usr/include/qt4/QtCore/qatomic_windowsce.h usr/include/qt4/QtCore/qatomic_x86_64.h usr/include/qt4/QtCore/qbasicatomic.h usr/include/qt4/QtCore/qbasictimer.h @@ -1178,6 +1347,7 @@ usr/include/qt4/QtCore/qconfig-minimal.h usr/include/qt4/QtCore/qconfig-small.h usr/include/qt4/QtCore/qconfig.h usr/include/qt4/QtCore/qcontainerfwd.h +usr/include/qt4/QtCore/qcontiguouscache.h usr/include/qt4/QtCore/qcoreapplication.h usr/include/qt4/QtCore/qcoreevent.h usr/include/qt4/QtCore/qcryptographichash.h @@ -1186,20 +1356,26 @@ usr/include/qt4/QtCore/qdatetime.h usr/include/qt4/QtCore/qdebug.h usr/include/qt4/QtCore/qdir.h usr/include/qt4/QtCore/qdiriterator.h +usr/include/qt4/QtCore/qeasingcurve.h usr/include/qt4/QtCore/qendian.h usr/include/qt4/QtCore/qeventloop.h +usr/include/qt4/QtCore/qeventtransition.h usr/include/qt4/QtCore/qfactoryinterface.h usr/include/qt4/QtCore/qfeatures.h usr/include/qt4/QtCore/qfile.h usr/include/qt4/QtCore/qfileinfo.h usr/include/qt4/QtCore/qfilesystemwatcher.h +usr/include/qt4/QtCore/qfinalstate.h usr/include/qt4/QtCore/qfsfileengine.h +usr/include/qt4/QtCore/qfunctions_vxworks.h +usr/include/qt4/QtCore/qfunctions_wince.h usr/include/qt4/QtCore/qfuture.h usr/include/qt4/QtCore/qfutureinterface.h usr/include/qt4/QtCore/qfuturesynchronizer.h usr/include/qt4/QtCore/qfuturewatcher.h usr/include/qt4/QtCore/qglobal.h usr/include/qt4/QtCore/qhash.h +usr/include/qt4/QtCore/qhistorystate.h usr/include/qt4/QtCore/qiodevice.h usr/include/qt4/QtCore/qiterator.h usr/include/qt4/QtCore/qlibrary.h @@ -1209,6 +1385,7 @@ usr/include/qt4/QtCore/qlinkedlist.h usr/include/qt4/QtCore/qlist.h usr/include/qt4/QtCore/qlocale.h usr/include/qt4/QtCore/qmap.h +usr/include/qt4/QtCore/qmargins.h usr/include/qt4/QtCore/qmath.h usr/include/qt4/QtCore/qmetaobject.h usr/include/qt4/QtCore/qmetatype.h @@ -1220,18 +1397,23 @@ usr/include/qt4/QtCore/qobject.h usr/include/qt4/QtCore/qobjectcleanuphandler.h usr/include/qt4/QtCore/qobjectdefs.h usr/include/qt4/QtCore/qpair.h +usr/include/qt4/QtCore/qparallelanimationgroup.h +usr/include/qt4/QtCore/qpauseanimation.h usr/include/qt4/QtCore/qplugin.h usr/include/qt4/QtCore/qpluginloader.h usr/include/qt4/QtCore/qpoint.h usr/include/qt4/QtCore/qpointer.h usr/include/qt4/QtCore/qprocess.h +usr/include/qt4/QtCore/qpropertyanimation.h usr/include/qt4/QtCore/qqueue.h usr/include/qt4/QtCore/qreadwritelock.h usr/include/qt4/QtCore/qrect.h usr/include/qt4/QtCore/qregexp.h usr/include/qt4/QtCore/qresource.h usr/include/qt4/QtCore/qrunnable.h +usr/include/qt4/QtCore/qscopedpointer.h usr/include/qt4/QtCore/qsemaphore.h +usr/include/qt4/QtCore/qsequentialanimationgroup.h usr/include/qt4/QtCore/qset.h usr/include/qt4/QtCore/qsettings.h usr/include/qt4/QtCore/qshareddata.h @@ -1239,13 +1421,18 @@ usr/include/qt4/QtCore/qsharedmemory.h usr/include/qt4/QtCore/qsharedpointer.h usr/include/qt4/QtCore/qsharedpointer_impl.h usr/include/qt4/QtCore/qsignalmapper.h +usr/include/qt4/QtCore/qsignaltransition.h usr/include/qt4/QtCore/qsize.h usr/include/qt4/QtCore/qsocketnotifier.h usr/include/qt4/QtCore/qstack.h +usr/include/qt4/QtCore/qstate.h +usr/include/qt4/QtCore/qstatemachine.h usr/include/qt4/QtCore/qstring.h +usr/include/qt4/QtCore/qstringbuilder.h usr/include/qt4/QtCore/qstringlist.h usr/include/qt4/QtCore/qstringmatcher.h usr/include/qt4/QtCore/qsystemsemaphore.h +usr/include/qt4/QtCore/qt_windows.h usr/include/qt4/QtCore/qtconcurrentcompilertest.h usr/include/qt4/QtCore/qtconcurrentexception.h usr/include/qt4/QtCore/qtconcurrentfilter.h @@ -1275,12 +1462,14 @@ usr/include/qt4/QtCore/qtranslator.h usr/include/qt4/QtCore/qurl.h usr/include/qt4/QtCore/quuid.h usr/include/qt4/QtCore/qvariant.h +usr/include/qt4/QtCore/qvariantanimation.h usr/include/qt4/QtCore/qvarlengtharray.h usr/include/qt4/QtCore/qvector.h usr/include/qt4/QtCore/qwaitcondition.h usr/include/qt4/QtCore/qxmlstream.h usr/include/qt4/QtDBus/QDBusAbstractAdaptor usr/include/qt4/QtDBus/QDBusAbstractInterface +usr/include/qt4/QtDBus/QDBusAbstractInterfaceBase usr/include/qt4/QtDBus/QDBusArgument usr/include/qt4/QtDBus/QDBusConnection usr/include/qt4/QtDBus/QDBusConnectionInterface @@ -1395,6 +1584,7 @@ usr/include/qt4/QtDesigner/sdk_global.h usr/include/qt4/QtDesigner/taskmenu.h usr/include/qt4/QtDesigner/uilib_global.h usr/include/qt4/QtGui/QAbstractButton +usr/include/qt4/QtGui/QAbstractFontEngine usr/include/qt4/QtGui/QAbstractGraphicsShapeItem usr/include/qt4/QtGui/QAbstractItemDelegate usr/include/qt4/QtGui/QAbstractItemView @@ -1430,6 +1620,7 @@ usr/include/qt4/QtGui/QAction usr/include/qt4/QtGui/QActionEvent usr/include/qt4/QtGui/QActionGroup usr/include/qt4/QtGui/QApplication +usr/include/qt4/QtGui/QAuthDevice usr/include/qt4/QtGui/QBitmap usr/include/qt4/QtGui/QBoxLayout usr/include/qt4/QtGui/QBrush @@ -1453,17 +1644,27 @@ usr/include/qt4/QtGui/QCommonStyle usr/include/qt4/QtGui/QCompleter usr/include/qt4/QtGui/QConicalGradient usr/include/qt4/QtGui/QContextMenuEvent +usr/include/qt4/QtGui/QCopChannel usr/include/qt4/QtGui/QCursor usr/include/qt4/QtGui/QCursorShape usr/include/qt4/QtGui/QDataWidgetMapper usr/include/qt4/QtGui/QDateEdit usr/include/qt4/QtGui/QDateTimeEdit +usr/include/qt4/QtGui/QDecoration +usr/include/qt4/QtGui/QDecorationAction +usr/include/qt4/QtGui/QDecorationDefault +usr/include/qt4/QtGui/QDecorationFactory +usr/include/qt4/QtGui/QDecorationFactoryInterface +usr/include/qt4/QtGui/QDecorationPlugin +usr/include/qt4/QtGui/QDecorationStyled +usr/include/qt4/QtGui/QDecorationWindows usr/include/qt4/QtGui/QDesktopServices usr/include/qt4/QtGui/QDesktopWidget usr/include/qt4/QtGui/QDial usr/include/qt4/QtGui/QDialog usr/include/qt4/QtGui/QDialogButtonBox usr/include/qt4/QtGui/QDirModel +usr/include/qt4/QtGui/QDirectPainter usr/include/qt4/QtGui/QDockWidget usr/include/qt4/QtGui/QDoubleSpinBox usr/include/qt4/QtGui/QDoubleValidator @@ -1484,15 +1685,28 @@ usr/include/qt4/QtGui/QFont usr/include/qt4/QtGui/QFontComboBox usr/include/qt4/QtGui/QFontDatabase usr/include/qt4/QtGui/QFontDialog +usr/include/qt4/QtGui/QFontEngineFactoryInterface +usr/include/qt4/QtGui/QFontEngineInfo +usr/include/qt4/QtGui/QFontEnginePlugin usr/include/qt4/QtGui/QFontInfo usr/include/qt4/QtGui/QFontMetrics usr/include/qt4/QtGui/QFontMetricsF usr/include/qt4/QtGui/QFormLayout usr/include/qt4/QtGui/QFrame +usr/include/qt4/QtGui/QGenericMatrix +usr/include/qt4/QtGui/QGesture usr/include/qt4/QtGui/QGradient usr/include/qt4/QtGui/QGradientStop usr/include/qt4/QtGui/QGradientStops +usr/include/qt4/QtGui/QGraphicsAnchor +usr/include/qt4/QtGui/QGraphicsAnchorLayout +usr/include/qt4/QtGui/QGraphicsBlurEffect +usr/include/qt4/QtGui/QGraphicsColorizeEffect +usr/include/qt4/QtGui/QGraphicsDropShadowEffect +usr/include/qt4/QtGui/QGraphicsEffect +usr/include/qt4/QtGui/QGraphicsEffectSource usr/include/qt4/QtGui/QGraphicsEllipseItem +usr/include/qt4/QtGui/QGraphicsGrayscaleEffect usr/include/qt4/QtGui/QGraphicsGridLayout usr/include/qt4/QtGui/QGraphicsItem usr/include/qt4/QtGui/QGraphicsItemAnimation @@ -1501,11 +1715,16 @@ usr/include/qt4/QtGui/QGraphicsLayout usr/include/qt4/QtGui/QGraphicsLayoutItem usr/include/qt4/QtGui/QGraphicsLineItem usr/include/qt4/QtGui/QGraphicsLinearLayout +usr/include/qt4/QtGui/QGraphicsObject +usr/include/qt4/QtGui/QGraphicsOpacityEffect usr/include/qt4/QtGui/QGraphicsPathItem +usr/include/qt4/QtGui/QGraphicsPixelizeEffect usr/include/qt4/QtGui/QGraphicsPixmapItem usr/include/qt4/QtGui/QGraphicsPolygonItem usr/include/qt4/QtGui/QGraphicsProxyWidget usr/include/qt4/QtGui/QGraphicsRectItem +usr/include/qt4/QtGui/QGraphicsRotation +usr/include/qt4/QtGui/QGraphicsScale usr/include/qt4/QtGui/QGraphicsScene usr/include/qt4/QtGui/QGraphicsSceneContextMenuEvent usr/include/qt4/QtGui/QGraphicsSceneDragDropEvent @@ -1518,6 +1737,7 @@ usr/include/qt4/QtGui/QGraphicsSceneResizeEvent usr/include/qt4/QtGui/QGraphicsSceneWheelEvent usr/include/qt4/QtGui/QGraphicsSimpleTextItem usr/include/qt4/QtGui/QGraphicsTextItem +usr/include/qt4/QtGui/QGraphicsTransform usr/include/qt4/QtGui/QGraphicsView usr/include/qt4/QtGui/QGraphicsWidget usr/include/qt4/QtGui/QGridLayout @@ -1559,7 +1779,10 @@ usr/include/qt4/QtGui/QItemEditorFactory usr/include/qt4/QtGui/QItemSelection usr/include/qt4/QtGui/QItemSelectionModel usr/include/qt4/QtGui/QItemSelectionRange +usr/include/qt4/QtGui/QKbdDriverFactory +usr/include/qt4/QtGui/QKbdDriverPlugin usr/include/qt4/QtGui/QKeyEvent +usr/include/qt4/QtGui/QKeyEventTransition usr/include/qt4/QtGui/QKeySequence usr/include/qt4/QtGui/QLCDNumber usr/include/qt4/QtGui/QLabel @@ -1568,13 +1791,27 @@ usr/include/qt4/QtGui/QLayoutItem usr/include/qt4/QtGui/QLayoutIterator usr/include/qt4/QtGui/QLineEdit usr/include/qt4/QtGui/QLinearGradient +usr/include/qt4/QtGui/QLinuxFbScreen +usr/include/qt4/QtGui/QLinuxFb_Shared usr/include/qt4/QtGui/QListView usr/include/qt4/QtGui/QListWidget usr/include/qt4/QtGui/QListWidgetItem +usr/include/qt4/QtGui/QMacCocoaViewContainer usr/include/qt4/QtGui/QMacMime +usr/include/qt4/QtGui/QMacNativeWidget usr/include/qt4/QtGui/QMacPasteboardMime +usr/include/qt4/QtGui/QMacStyle usr/include/qt4/QtGui/QMainWindow usr/include/qt4/QtGui/QMatrix +usr/include/qt4/QtGui/QMatrix2x2 +usr/include/qt4/QtGui/QMatrix2x3 +usr/include/qt4/QtGui/QMatrix2x4 +usr/include/qt4/QtGui/QMatrix3x2 +usr/include/qt4/QtGui/QMatrix3x3 +usr/include/qt4/QtGui/QMatrix3x4 +usr/include/qt4/QtGui/QMatrix4x2 +usr/include/qt4/QtGui/QMatrix4x3 +usr/include/qt4/QtGui/QMatrix4x4 usr/include/qt4/QtGui/QMdiArea usr/include/qt4/QtGui/QMdiSubWindow usr/include/qt4/QtGui/QMenu @@ -1584,7 +1821,10 @@ usr/include/qt4/QtGui/QMenubarUpdatedEvent usr/include/qt4/QtGui/QMessageBox usr/include/qt4/QtGui/QMimeSource usr/include/qt4/QtGui/QMotifStyle +usr/include/qt4/QtGui/QMouseDriverFactory +usr/include/qt4/QtGui/QMouseDriverPlugin usr/include/qt4/QtGui/QMouseEvent +usr/include/qt4/QtGui/QMouseEventTransition usr/include/qt4/QtGui/QMoveEvent usr/include/qt4/QtGui/QMovie usr/include/qt4/QtGui/QPageSetupDialog @@ -1597,11 +1837,13 @@ usr/include/qt4/QtGui/QPainterPath usr/include/qt4/QtGui/QPainterPathPrivate usr/include/qt4/QtGui/QPainterPathStroker usr/include/qt4/QtGui/QPalette +usr/include/qt4/QtGui/QPanGesture usr/include/qt4/QtGui/QPen usr/include/qt4/QtGui/QPicture usr/include/qt4/QtGui/QPictureFormatInterface usr/include/qt4/QtGui/QPictureFormatPlugin usr/include/qt4/QtGui/QPictureIO +usr/include/qt4/QtGui/QPinchGesture usr/include/qt4/QtGui/QPixmap usr/include/qt4/QtGui/QPixmapCache usr/include/qt4/QtGui/QPlainTextDocumentLayout @@ -1609,6 +1851,7 @@ usr/include/qt4/QtGui/QPlainTextEdit usr/include/qt4/QtGui/QPlastiqueStyle usr/include/qt4/QtGui/QPolygon usr/include/qt4/QtGui/QPolygonF +usr/include/qt4/QtGui/QPoolEntry usr/include/qt4/QtGui/QPrintDialog usr/include/qt4/QtGui/QPrintEngine usr/include/qt4/QtGui/QPrintPreviewDialog @@ -1618,7 +1861,13 @@ usr/include/qt4/QtGui/QPrinterInfo usr/include/qt4/QtGui/QProgressBar usr/include/qt4/QtGui/QProgressDialog usr/include/qt4/QtGui/QProxyModel +usr/include/qt4/QtGui/QProxyScreen +usr/include/qt4/QtGui/QProxyScreenCursor +usr/include/qt4/QtGui/QProxyStyle usr/include/qt4/QtGui/QPushButton +usr/include/qt4/QtGui/QQnxMouseHandler +usr/include/qt4/QtGui/QQnxScreen +usr/include/qt4/QtGui/QQuaternion usr/include/qt4/QtGui/QRadialGradient usr/include/qt4/QtGui/QRadioButton usr/include/qt4/QtGui/QRegExpValidator @@ -1626,6 +1875,15 @@ usr/include/qt4/QtGui/QRegion usr/include/qt4/QtGui/QResizeEvent usr/include/qt4/QtGui/QRgb usr/include/qt4/QtGui/QRubberBand +usr/include/qt4/QtGui/QS60MainAppUi +usr/include/qt4/QtGui/QS60MainApplication +usr/include/qt4/QtGui/QS60MainDocument +usr/include/qt4/QtGui/QS60Style +usr/include/qt4/QtGui/QScreen +usr/include/qt4/QtGui/QScreenCursor +usr/include/qt4/QtGui/QScreenDriverFactory +usr/include/qt4/QtGui/QScreenDriverFactoryInterface +usr/include/qt4/QtGui/QScreenDriverPlugin usr/include/qt4/QtGui/QScrollArea usr/include/qt4/QtGui/QScrollBar usr/include/qt4/QtGui/QSessionManager @@ -1697,6 +1955,7 @@ usr/include/qt4/QtGui/QStyleOptionViewItemV4 usr/include/qt4/QtGui/QStylePainter usr/include/qt4/QtGui/QStylePlugin usr/include/qt4/QtGui/QStyledItemDelegate +usr/include/qt4/QtGui/QSwipeGesture usr/include/qt4/QtGui/QSyntaxHighlighter usr/include/qt4/QtGui/QSystemTrayIcon usr/include/qt4/QtGui/QTabBar @@ -1737,13 +1996,17 @@ usr/include/qt4/QtGui/QTextTable usr/include/qt4/QtGui/QTextTableCell usr/include/qt4/QtGui/QTextTableCellFormat usr/include/qt4/QtGui/QTextTableFormat +usr/include/qt4/QtGui/QTileRules usr/include/qt4/QtGui/QTimeEdit usr/include/qt4/QtGui/QToolBar usr/include/qt4/QtGui/QToolBarChangeEvent usr/include/qt4/QtGui/QToolBox usr/include/qt4/QtGui/QToolButton usr/include/qt4/QtGui/QToolTip +usr/include/qt4/QtGui/QTouchEvent usr/include/qt4/QtGui/QTransform +usr/include/qt4/QtGui/QTransformedScreen +usr/include/qt4/QtGui/QTransportAuth usr/include/qt4/QtGui/QTreeView usr/include/qt4/QtGui/QTreeWidget usr/include/qt4/QtGui/QTreeWidgetItem @@ -1755,8 +2018,50 @@ usr/include/qt4/QtGui/QUndoView usr/include/qt4/QtGui/QUnixPrintWidget usr/include/qt4/QtGui/QUpdateLaterEvent usr/include/qt4/QtGui/QVBoxLayout +usr/include/qt4/QtGui/QVFbHeader +usr/include/qt4/QtGui/QVFbKeyData +usr/include/qt4/QtGui/QVFbKeyboardHandler +usr/include/qt4/QtGui/QVFbMouseHandler +usr/include/qt4/QtGui/QVFbScreen usr/include/qt4/QtGui/QValidator +usr/include/qt4/QtGui/QVector2D +usr/include/qt4/QtGui/QVector3D +usr/include/qt4/QtGui/QVector4D usr/include/qt4/QtGui/QWMatrix +usr/include/qt4/QtGui/QWSCalibratedMouseHandler +usr/include/qt4/QtGui/QWSClient +usr/include/qt4/QtGui/QWSCursor +usr/include/qt4/QtGui/QWSCursorMap +usr/include/qt4/QtGui/QWSDisplay +usr/include/qt4/QtGui/QWSEmbedWidget +usr/include/qt4/QtGui/QWSEvent +usr/include/qt4/QtGui/QWSInputMethod +usr/include/qt4/QtGui/QWSInternalWindowInfo +usr/include/qt4/QtGui/QWSKeyboardHandler +usr/include/qt4/QtGui/QWSKeyboardHandlerFactoryInterface +usr/include/qt4/QtGui/QWSLinuxInputKeyboardHandler +usr/include/qt4/QtGui/QWSLinuxInputMouseHandler +usr/include/qt4/QtGui/QWSLinuxTPMouseHandler +usr/include/qt4/QtGui/QWSManager +usr/include/qt4/QtGui/QWSMouseHandler +usr/include/qt4/QtGui/QWSMouseHandlerFactoryInterface +usr/include/qt4/QtGui/QWSPcMouseHandler +usr/include/qt4/QtGui/QWSPointerCalibrationData +usr/include/qt4/QtGui/QWSPropertyManager +usr/include/qt4/QtGui/QWSProtocolItem +usr/include/qt4/QtGui/QWSQnxKeyboardHandler +usr/include/qt4/QtGui/QWSScreenSaver +usr/include/qt4/QtGui/QWSServer +usr/include/qt4/QtGui/QWSServerSocket +usr/include/qt4/QtGui/QWSSocket +usr/include/qt4/QtGui/QWSSoundClient +usr/include/qt4/QtGui/QWSSoundServer +usr/include/qt4/QtGui/QWSSoundServerSocket +usr/include/qt4/QtGui/QWSTslibMouseHandler +usr/include/qt4/QtGui/QWSTtyKeyboardHandler +usr/include/qt4/QtGui/QWSUmKeyboardHandler +usr/include/qt4/QtGui/QWSWindow +usr/include/qt4/QtGui/QWSWindowInfo usr/include/qt4/QtGui/QWhatsThis usr/include/qt4/QtGui/QWhatsThisClickedEvent usr/include/qt4/QtGui/QWheelEvent @@ -1784,6 +2089,7 @@ usr/include/qt4/QtGui/QX11Info usr/include/qt4/QtGui/QtEvents usr/include/qt4/QtGui/QtGui usr/include/qt4/QtGui/qabstractbutton.h +usr/include/qt4/QtGui/qabstractfontengine_qws.h usr/include/qt4/QtGui/qabstractitemdelegate.h usr/include/qt4/QtGui/qabstractitemview.h usr/include/qt4/QtGui/qabstractpagesetupdialog.h @@ -1819,14 +2125,22 @@ usr/include/qt4/QtGui/qcombobox.h usr/include/qt4/QtGui/qcommandlinkbutton.h usr/include/qt4/QtGui/qcommonstyle.h usr/include/qt4/QtGui/qcompleter.h +usr/include/qt4/QtGui/qcopchannel_qws.h usr/include/qt4/QtGui/qcursor.h usr/include/qt4/QtGui/qdatawidgetmapper.h usr/include/qt4/QtGui/qdatetimeedit.h +usr/include/qt4/QtGui/qdecoration_qws.h +usr/include/qt4/QtGui/qdecorationdefault_qws.h +usr/include/qt4/QtGui/qdecorationfactory_qws.h +usr/include/qt4/QtGui/qdecorationplugin_qws.h +usr/include/qt4/QtGui/qdecorationstyled_qws.h +usr/include/qt4/QtGui/qdecorationwindows_qws.h usr/include/qt4/QtGui/qdesktopservices.h usr/include/qt4/QtGui/qdesktopwidget.h usr/include/qt4/QtGui/qdial.h usr/include/qt4/QtGui/qdialog.h usr/include/qt4/QtGui/qdialogbuttonbox.h +usr/include/qt4/QtGui/qdirectpainter_qws.h usr/include/qt4/QtGui/qdirmodel.h usr/include/qt4/QtGui/qdockwidget.h usr/include/qt4/QtGui/qdrag.h @@ -1845,6 +2159,10 @@ usr/include/qt4/QtGui/qfontinfo.h usr/include/qt4/QtGui/qfontmetrics.h usr/include/qt4/QtGui/qformlayout.h usr/include/qt4/QtGui/qframe.h +usr/include/qt4/QtGui/qgenericmatrix.h +usr/include/qt4/QtGui/qgesture.h +usr/include/qt4/QtGui/qgraphicsanchorlayout.h +usr/include/qt4/QtGui/qgraphicseffect.h usr/include/qt4/QtGui/qgraphicsgridlayout.h usr/include/qt4/QtGui/qgraphicsitem.h usr/include/qt4/QtGui/qgraphicsitemanimation.h @@ -1854,11 +2172,13 @@ usr/include/qt4/QtGui/qgraphicslinearlayout.h usr/include/qt4/QtGui/qgraphicsproxywidget.h usr/include/qt4/QtGui/qgraphicsscene.h usr/include/qt4/QtGui/qgraphicssceneevent.h +usr/include/qt4/QtGui/qgraphicstransform.h usr/include/qt4/QtGui/qgraphicsview.h usr/include/qt4/QtGui/qgraphicswidget.h usr/include/qt4/QtGui/qgridlayout.h usr/include/qt4/QtGui/qgroupbox.h usr/include/qt4/QtGui/qgtkstyle.h +usr/include/qt4/QtGui/qguifunctions_wince.h usr/include/qt4/QtGui/qheaderview.h usr/include/qt4/QtGui/qicon.h usr/include/qt4/QtGui/qiconengine.h @@ -1874,6 +2194,15 @@ usr/include/qt4/QtGui/qinputdialog.h usr/include/qt4/QtGui/qitemdelegate.h usr/include/qt4/QtGui/qitemeditorfactory.h usr/include/qt4/QtGui/qitemselectionmodel.h +usr/include/qt4/QtGui/qkbd_qws.h +usr/include/qt4/QtGui/qkbddriverfactory_qws.h +usr/include/qt4/QtGui/qkbddriverplugin_qws.h +usr/include/qt4/QtGui/qkbdlinuxinput_qws.h +usr/include/qt4/QtGui/qkbdqnx_qws.h +usr/include/qt4/QtGui/qkbdtty_qws.h +usr/include/qt4/QtGui/qkbdum_qws.h +usr/include/qt4/QtGui/qkbdvfb_qws.h +usr/include/qt4/QtGui/qkeyeventtransition.h usr/include/qt4/QtGui/qkeysequence.h usr/include/qt4/QtGui/qlabel.h usr/include/qt4/QtGui/qlayout.h @@ -1882,8 +2211,13 @@ usr/include/qt4/QtGui/qlcdnumber.h usr/include/qt4/QtGui/qlineedit.h usr/include/qt4/QtGui/qlistview.h usr/include/qt4/QtGui/qlistwidget.h +usr/include/qt4/QtGui/qmaccocoaviewcontainer_mac.h +usr/include/qt4/QtGui/qmacdefines_mac.h +usr/include/qt4/QtGui/qmacnativewidget_mac.h +usr/include/qt4/QtGui/qmacstyle_mac.h usr/include/qt4/QtGui/qmainwindow.h usr/include/qt4/QtGui/qmatrix.h +usr/include/qt4/QtGui/qmatrix4x4.h usr/include/qt4/QtGui/qmdiarea.h usr/include/qt4/QtGui/qmdisubwindow.h usr/include/qt4/QtGui/qmenu.h @@ -1892,6 +2226,16 @@ usr/include/qt4/QtGui/qmenudata.h usr/include/qt4/QtGui/qmessagebox.h usr/include/qt4/QtGui/qmime.h usr/include/qt4/QtGui/qmotifstyle.h +usr/include/qt4/QtGui/qmouse_qws.h +usr/include/qt4/QtGui/qmousedriverfactory_qws.h +usr/include/qt4/QtGui/qmousedriverplugin_qws.h +usr/include/qt4/QtGui/qmouseeventtransition.h +usr/include/qt4/QtGui/qmouselinuxinput_qws.h +usr/include/qt4/QtGui/qmouselinuxtp_qws.h +usr/include/qt4/QtGui/qmousepc_qws.h +usr/include/qt4/QtGui/qmouseqnx_qws.h +usr/include/qt4/QtGui/qmousetslib_qws.h +usr/include/qt4/QtGui/qmousevfb_qws.h usr/include/qt4/QtGui/qmovie.h usr/include/qt4/QtGui/qpagesetupdialog.h usr/include/qt4/QtGui/qpaintdevice.h @@ -1916,11 +2260,25 @@ usr/include/qt4/QtGui/qprintpreviewwidget.h usr/include/qt4/QtGui/qprogressbar.h usr/include/qt4/QtGui/qprogressdialog.h usr/include/qt4/QtGui/qproxymodel.h +usr/include/qt4/QtGui/qproxystyle.h usr/include/qt4/QtGui/qpushbutton.h +usr/include/qt4/QtGui/qquaternion.h usr/include/qt4/QtGui/qradiobutton.h usr/include/qt4/QtGui/qregion.h usr/include/qt4/QtGui/qrgb.h usr/include/qt4/QtGui/qrubberband.h +usr/include/qt4/QtGui/qs60mainapplication.h +usr/include/qt4/QtGui/qs60mainappui.h +usr/include/qt4/QtGui/qs60maindocument.h +usr/include/qt4/QtGui/qs60style.h +usr/include/qt4/QtGui/qscreen_qws.h +usr/include/qt4/QtGui/qscreendriverfactory_qws.h +usr/include/qt4/QtGui/qscreendriverplugin_qws.h +usr/include/qt4/QtGui/qscreenlinuxfb_qws.h +usr/include/qt4/QtGui/qscreenproxy_qws.h +usr/include/qt4/QtGui/qscreenqnx_qws.h +usr/include/qt4/QtGui/qscreentransformed_qws.h +usr/include/qt4/QtGui/qscreenvfb_qws.h usr/include/qt4/QtGui/qscrollarea.h usr/include/qt4/QtGui/qscrollbar.h usr/include/qt4/QtGui/qsessionmanager.h @@ -1930,11 +2288,13 @@ usr/include/qt4/QtGui/qsizepolicy.h usr/include/qt4/QtGui/qslider.h usr/include/qt4/QtGui/qsortfilterproxymodel.h usr/include/qt4/QtGui/qsound.h +usr/include/qt4/QtGui/qsoundqss_qws.h usr/include/qt4/QtGui/qspinbox.h usr/include/qt4/QtGui/qsplashscreen.h usr/include/qt4/QtGui/qsplitter.h usr/include/qt4/QtGui/qstackedlayout.h usr/include/qt4/QtGui/qstackedwidget.h +usr/include/qt4/QtGui/qstandardgestures.h usr/include/qt4/QtGui/qstandarditemmodel.h usr/include/qt4/QtGui/qstatusbar.h usr/include/qt4/QtGui/qstringlistmodel.h @@ -1967,6 +2327,8 @@ usr/include/qt4/QtGui/qtoolbox.h usr/include/qt4/QtGui/qtoolbutton.h usr/include/qt4/QtGui/qtooltip.h usr/include/qt4/QtGui/qtransform.h +usr/include/qt4/QtGui/qtransportauth_qws.h +usr/include/qt4/QtGui/qtransportauthdefs_qws.h usr/include/qt4/QtGui/qtreeview.h usr/include/qt4/QtGui/qtreewidget.h usr/include/qt4/QtGui/qtreewidgetitemiterator.h @@ -1974,18 +2336,33 @@ usr/include/qt4/QtGui/qundogroup.h usr/include/qt4/QtGui/qundostack.h usr/include/qt4/QtGui/qundoview.h usr/include/qt4/QtGui/qvalidator.h +usr/include/qt4/QtGui/qvector2d.h +usr/include/qt4/QtGui/qvector3d.h +usr/include/qt4/QtGui/qvector4d.h +usr/include/qt4/QtGui/qvfbhdr.h usr/include/qt4/QtGui/qwhatsthis.h usr/include/qt4/QtGui/qwidget.h usr/include/qt4/QtGui/qwidgetaction.h usr/include/qt4/QtGui/qwindowdefs.h +usr/include/qt4/QtGui/qwindowdefs_win.h usr/include/qt4/QtGui/qwindowscestyle.h usr/include/qt4/QtGui/qwindowsmobilestyle.h usr/include/qt4/QtGui/qwindowsstyle.h usr/include/qt4/QtGui/qwindowsvistastyle.h usr/include/qt4/QtGui/qwindowsxpstyle.h +usr/include/qt4/QtGui/qwindowsystem_qws.h usr/include/qt4/QtGui/qwizard.h usr/include/qt4/QtGui/qwmatrix.h usr/include/qt4/QtGui/qworkspace.h +usr/include/qt4/QtGui/qwscursor_qws.h +usr/include/qt4/QtGui/qwsdisplay_qws.h +usr/include/qt4/QtGui/qwsembedwidget.h +usr/include/qt4/QtGui/qwsevent_qws.h +usr/include/qt4/QtGui/qwsmanager_qws.h +usr/include/qt4/QtGui/qwsproperty_qws.h +usr/include/qt4/QtGui/qwsprotocolitem_qws.h +usr/include/qt4/QtGui/qwssocket_qws.h +usr/include/qt4/QtGui/qwsutils_qws.h usr/include/qt4/QtGui/qx11embed_x11.h usr/include/qt4/QtGui/qx11info_x11.h usr/include/qt4/QtHelp/QHelpContentItem @@ -2009,6 +2386,31 @@ usr/include/qt4/QtHelp/qhelpindexwidget.h usr/include/qt4/QtHelp/qhelpsearchengine.h usr/include/qt4/QtHelp/qhelpsearchquerywidget.h usr/include/qt4/QtHelp/qhelpsearchresultwidget.h +usr/include/qt4/QtMultimedia/QAbstractAudioDeviceInfo +usr/include/qt4/QtMultimedia/QAbstractAudioInput +usr/include/qt4/QtMultimedia/QAbstractAudioOutput +usr/include/qt4/QtMultimedia/QAbstractVideoBuffer +usr/include/qt4/QtMultimedia/QAbstractVideoSurface +usr/include/qt4/QtMultimedia/QAudioDeviceInfo +usr/include/qt4/QtMultimedia/QAudioEngineFactoryInterface +usr/include/qt4/QtMultimedia/QAudioEnginePlugin +usr/include/qt4/QtMultimedia/QAudioFormat +usr/include/qt4/QtMultimedia/QAudioInput +usr/include/qt4/QtMultimedia/QAudioOutput +usr/include/qt4/QtMultimedia/QVideoFrame +usr/include/qt4/QtMultimedia/QVideoSurfaceFormat +usr/include/qt4/QtMultimedia/QtMultimedia +usr/include/qt4/QtMultimedia/qabstractvideobuffer.h +usr/include/qt4/QtMultimedia/qabstractvideosurface.h +usr/include/qt4/QtMultimedia/qaudio.h +usr/include/qt4/QtMultimedia/qaudiodeviceinfo.h +usr/include/qt4/QtMultimedia/qaudioengine.h +usr/include/qt4/QtMultimedia/qaudioengineplugin.h +usr/include/qt4/QtMultimedia/qaudioformat.h +usr/include/qt4/QtMultimedia/qaudioinput.h +usr/include/qt4/QtMultimedia/qaudiooutput.h +usr/include/qt4/QtMultimedia/qvideoframe.h +usr/include/qt4/QtMultimedia/qvideosurfaceformat.h usr/include/qt4/QtNetwork/QAbstractNetworkCache usr/include/qt4/QtNetwork/QAbstractSocket usr/include/qt4/QtNetwork/QAuthenticator @@ -2058,6 +2460,7 @@ usr/include/qt4/QtNetwork/qlocalserver.h usr/include/qt4/QtNetwork/qlocalsocket.h usr/include/qt4/QtNetwork/qnetworkaccessmanager.h usr/include/qt4/QtNetwork/qnetworkcookie.h +usr/include/qt4/QtNetwork/qnetworkcookiejar.h usr/include/qt4/QtNetwork/qnetworkdiskcache.h usr/include/qt4/QtNetwork/qnetworkinterface.h usr/include/qt4/QtNetwork/qnetworkproxy.h @@ -2179,15 +2582,25 @@ usr/include/qt4/QtTest/QSpontaneKeyEvent usr/include/qt4/QtTest/QTest usr/include/qt4/QtTest/QTestAccessibility usr/include/qt4/QtTest/QTestAccessibilityEvent +usr/include/qt4/QtTest/QTestBasicStreamer +usr/include/qt4/QtTest/QTestCoreElement +usr/include/qt4/QtTest/QTestCoreList usr/include/qt4/QtTest/QTestData usr/include/qt4/QtTest/QTestDelayEvent +usr/include/qt4/QtTest/QTestElement +usr/include/qt4/QtTest/QTestElementAttribute usr/include/qt4/QtTest/QTestEvent usr/include/qt4/QtTest/QTestEventList usr/include/qt4/QtTest/QTestEventLoop +usr/include/qt4/QtTest/QTestFileLogger usr/include/qt4/QtTest/QTestKeyClicksEvent usr/include/qt4/QtTest/QTestKeyEvent +usr/include/qt4/QtTest/QTestLightXmlStreamer usr/include/qt4/QtTest/QTestMouseEvent +usr/include/qt4/QtTest/QTestXmlStreamer +usr/include/qt4/QtTest/QTestXunitStreamer usr/include/qt4/QtTest/QtTest +usr/include/qt4/QtTest/QtTestGui usr/include/qt4/QtTest/qbenchmark.h usr/include/qt4/QtTest/qsignalspy.h usr/include/qt4/QtTest/qtest.h @@ -2195,35 +2608,55 @@ usr/include/qt4/QtTest/qtest_global.h usr/include/qt4/QtTest/qtest_gui.h usr/include/qt4/QtTest/qtestaccessible.h usr/include/qt4/QtTest/qtestassert.h +usr/include/qt4/QtTest/qtestbasicstreamer.h usr/include/qt4/QtTest/qtestcase.h +usr/include/qt4/QtTest/qtestcoreelement.h +usr/include/qt4/QtTest/qtestcorelist.h usr/include/qt4/QtTest/qtestdata.h +usr/include/qt4/QtTest/qtestelement.h +usr/include/qt4/QtTest/qtestelementattribute.h usr/include/qt4/QtTest/qtestevent.h usr/include/qt4/QtTest/qtesteventloop.h +usr/include/qt4/QtTest/qtestfilelogger.h usr/include/qt4/QtTest/qtestkeyboard.h +usr/include/qt4/QtTest/qtestlightxmlstreamer.h usr/include/qt4/QtTest/qtestmouse.h usr/include/qt4/QtTest/qtestspontaneevent.h usr/include/qt4/QtTest/qtestsystem.h +usr/include/qt4/QtTest/qtesttouch.h +usr/include/qt4/QtTest/qtestxmlstreamer.h +usr/include/qt4/QtTest/qtestxunitstreamer.h usr/include/qt4/QtUiTools/QUiLoader usr/include/qt4/QtUiTools/QtUiTools usr/include/qt4/QtUiTools/quiloader.h usr/include/qt4/QtWebKit/QWebDatabase +usr/include/qt4/QtWebKit/QWebElement usr/include/qt4/QtWebKit/QWebFrame +usr/include/qt4/QtWebKit/QWebGraphicsItem usr/include/qt4/QtWebKit/QWebHistory usr/include/qt4/QtWebKit/QWebHistoryInterface usr/include/qt4/QtWebKit/QWebHistoryItem usr/include/qt4/QtWebKit/QWebHitTestResult +usr/include/qt4/QtWebKit/QWebInspector usr/include/qt4/QtWebKit/QWebPage +usr/include/qt4/QtWebKit/QWebPluginDatabase usr/include/qt4/QtWebKit/QWebPluginFactory +usr/include/qt4/QtWebKit/QWebPluginInfo usr/include/qt4/QtWebKit/QWebSecurityOrigin usr/include/qt4/QtWebKit/QWebSettings usr/include/qt4/QtWebKit/QWebView usr/include/qt4/QtWebKit/QtWebKit usr/include/qt4/QtWebKit/qwebdatabase.h +usr/include/qt4/QtWebKit/qwebelement.h usr/include/qt4/QtWebKit/qwebframe.h +usr/include/qt4/QtWebKit/qwebgraphicsitem.h usr/include/qt4/QtWebKit/qwebhistory.h usr/include/qt4/QtWebKit/qwebhistoryinterface.h +usr/include/qt4/QtWebKit/qwebinspector.h usr/include/qt4/QtWebKit/qwebkitglobal.h +usr/include/qt4/QtWebKit/qwebkitversion.h usr/include/qt4/QtWebKit/qwebpage.h +usr/include/qt4/QtWebKit/qwebplugindatabase.h usr/include/qt4/QtWebKit/qwebpluginfactory.h usr/include/qt4/QtWebKit/qwebsecurityorigin.h usr/include/qt4/QtWebKit/qwebsettings.h @@ -2288,6 +2721,8 @@ usr/include/qt4/QtXmlPatterns/QXmlNamePool usr/include/qt4/QtXmlPatterns/QXmlNodeModelIndex usr/include/qt4/QtXmlPatterns/QXmlQuery usr/include/qt4/QtXmlPatterns/QXmlResultItems +usr/include/qt4/QtXmlPatterns/QXmlSchema +usr/include/qt4/QtXmlPatterns/QXmlSchemaValidator usr/include/qt4/QtXmlPatterns/QXmlSerializer usr/include/qt4/QtXmlPatterns/QtXmlPatterns usr/include/qt4/QtXmlPatterns/qabstractmessagehandler.h @@ -2301,6 +2736,8 @@ usr/include/qt4/QtXmlPatterns/qxmlname.h usr/include/qt4/QtXmlPatterns/qxmlnamepool.h usr/include/qt4/QtXmlPatterns/qxmlquery.h usr/include/qt4/QtXmlPatterns/qxmlresultitems.h +usr/include/qt4/QtXmlPatterns/qxmlschema.h +usr/include/qt4/QtXmlPatterns/qxmlschemavalidator.h usr/include/qt4/QtXmlPatterns/qxmlserializer.h usr/lib/libQt3Support.prl usr/lib/libQt3Support.so @@ -2320,6 +2757,8 @@ usr/lib/libQtGui.prl usr/lib/libQtGui.so usr/lib/libQtHelp.prl usr/lib/libQtHelp.so +usr/lib/libQtMultimedia.prl +usr/lib/libQtMultimedia.so usr/lib/libQtNetwork.prl usr/lib/libQtNetwork.so usr/lib/libQtScript.prl @@ -2349,6 +2788,7 @@ usr/lib/pkgconfig/QtDesigner.pc usr/lib/pkgconfig/QtDesignerComponents.pc usr/lib/pkgconfig/QtGui.pc usr/lib/pkgconfig/QtHelp.pc +usr/lib/pkgconfig/QtMultimedia.pc usr/lib/pkgconfig/QtNetwork.pc usr/lib/pkgconfig/QtScript.pc usr/lib/pkgconfig/QtScriptTools.pc diff --git a/debian/libqt4-multimedia.install b/debian/libqt4-multimedia.install new file mode 100644 index 0000000..2f6f97d --- /dev/null +++ b/debian/libqt4-multimedia.install @@ -0,0 +1 @@ +usr/lib/libQtMultimedia.so.* diff --git a/debian/libqt4-multimedia.lintian b/debian/libqt4-multimedia.lintian new file mode 100644 index 0000000..dbf138a --- /dev/null +++ b/debian/libqt4-multimedia.lintian @@ -0,0 +1 @@ +libqt4-multimedia: package-name-doesnt-match-sonames libQtMultimedia4 diff --git a/debian/libqt4-opengl-dev.install b/debian/libqt4-opengl-dev.install index 2fd04e4..54f2fc5 100644 --- a/debian/libqt4-opengl-dev.install +++ b/debian/libqt4-opengl-dev.install @@ -1,25 +1,32 @@ usr/include/qt4/Qt/QtOpenGL -usr/include/qt4/Qt/glgc_shader_source.h usr/include/qt4/Qt/qgl.h usr/include/qt4/Qt/qglcolormap.h usr/include/qt4/Qt/qglframebufferobject.h usr/include/qt4/Qt/qglpixelbuffer.h +usr/include/qt4/Qt/qglscreen_qws.h +usr/include/qt4/Qt/qglshaderprogram.h usr/include/qt4/QtOpenGL/QGLColormap usr/include/qt4/QtOpenGL/QGLContext usr/include/qt4/QtOpenGL/QGLFormat usr/include/qt4/QtOpenGL/QGLFramebufferObject +usr/include/qt4/QtOpenGL/QGLFramebufferObjectFormat usr/include/qt4/QtOpenGL/QGLPixelBuffer +usr/include/qt4/QtOpenGL/QGLScreen +usr/include/qt4/QtOpenGL/QGLScreenSurfaceFunctions +usr/include/qt4/QtOpenGL/QGLShader +usr/include/qt4/QtOpenGL/QGLShaderProgram usr/include/qt4/QtOpenGL/QGLWidget usr/include/qt4/QtOpenGL/QMacCompatGLenum usr/include/qt4/QtOpenGL/QMacCompatGLint usr/include/qt4/QtOpenGL/QMacCompatGLuint usr/include/qt4/QtOpenGL/QMacGLCompatTypes usr/include/qt4/QtOpenGL/QtOpenGL -usr/include/qt4/QtOpenGL/glgc_shader_source.h usr/include/qt4/QtOpenGL/qgl.h usr/include/qt4/QtOpenGL/qglcolormap.h usr/include/qt4/QtOpenGL/qglframebufferobject.h usr/include/qt4/QtOpenGL/qglpixelbuffer.h +usr/include/qt4/QtOpenGL/qglscreen_qws.h +usr/include/qt4/QtOpenGL/qglshaderprogram.h usr/lib/libQtOpenGL.prl usr/lib/libQtOpenGL.so usr/lib/pkgconfig/QtOpenGL.pc diff --git a/debian/libqt4-webkit-dbg.lintian b/debian/libqt4-webkit-dbg.lintian index 5522f31..61d9407 100644 --- a/debian/libqt4-webkit-dbg.lintian +++ b/debian/libqt4-webkit-dbg.lintian @@ -1,5 +1,5 @@ -libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtWebKit.so.4.5.3.debug +libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtWebKit.so.4.6.0.debug libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/designer/libqwebview.so.debug -libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/libQtWebKit.so.4.5.3.debug +libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/libQtWebKit.so.4.6.0.debug libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqwebview.so.debug -libqt4-webkit-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtWebKit.so.4.5.3.debug +libqt4-webkit-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtWebKit.so.4.6.0.debug diff --git a/debian/libqt4-xmlpatterns-dbg.lintian b/debian/libqt4-xmlpatterns-dbg.lintian index cb1623c..ddc299d 100644 --- a/debian/libqt4-xmlpatterns-dbg.lintian +++ b/debian/libqt4-xmlpatterns-dbg.lintian @@ -1,3 +1,3 @@ -libqt4-xmlpatterns-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXmlPatterns.so.4.5.3.debug -libqt4-xmlpatterns-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXmlPatterns.so.4.5.3.debug -libqt4-xmlpatterns-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXmlPatterns.so.4.5.3.debug +libqt4-xmlpatterns-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXmlPatterns.so.4.6.0.debug +libqt4-xmlpatterns-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXmlPatterns.so.4.6.0.debug +libqt4-xmlpatterns-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXmlPatterns.so.4.6.0.debug diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install index 5d2a8fb..4f2e53a 100644 --- a/debian/libqtcore4.install +++ b/debian/libqtcore4.install @@ -13,6 +13,7 @@ usr/share/qt4/translations/qt_pl.qm usr/share/qt4/translations/qt_pt.qm usr/share/qt4/translations/qt_ru.qm usr/share/qt4/translations/qt_sk.qm +usr/share/qt4/translations/qt_sl.qm usr/share/qt4/translations/qt_sv.qm usr/share/qt4/translations/qt_uk.qm usr/share/qt4/translations/qt_untranslated.qm diff --git a/debian/libqtgui4.install b/debian/libqtgui4.install index 130a656..f8f9973 100644 --- a/debian/libqtgui4.install +++ b/debian/libqtgui4.install @@ -1,5 +1,6 @@ usr/lib/libQtGui.so.* usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so +usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so usr/lib/qt4/plugins/imageformats/libqgif.so usr/lib/qt4/plugins/imageformats/libqico.so usr/lib/qt4/plugins/imageformats/libqjpeg.so diff --git a/debian/not-installed b/debian/not-installed index 13030d5..8a82fad 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -17,16 +17,19 @@ ./usr/bin/qhelpgenerator.debug ./usr/bin/qt3to4.debug ./usr/bin/qtconfig-qt4.debug +./usr/bin/qttracereplay.debug ./usr/bin/rcc.debug ./usr/bin/uic-qt4.debug ./usr/bin/uic3.debug ./usr/bin/xmlpatterns.debug +./usr/bin/xmlpatternsvalidator.debug ./usr/lib/libQt3Support.la ./usr/lib/libQtCLucene.la ./usr/lib/libQtCore.la ./usr/lib/libQtDBus.la ./usr/lib/libQtGui.la ./usr/lib/libQtHelp.la +./usr/lib/libQtMultimedia.la ./usr/lib/libQtNetwork.la ./usr/lib/libQtOpenGL.la ./usr/lib/libQtScript.la diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff index c27cede..b293715 100644 --- a/debian/patches/0180-window-role.diff +++ b/debian/patches/0180-window-role.diff @@ -21,7 +21,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp -@@ -986,8 +986,16 @@ void QObject::setObjectName(const QStrin +@@ -1122,8 +1122,16 @@ void QObject::setObjectName(const QStrin { Q_D(QObject); d->objectName = name; @@ -40,21 +40,21 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse /*! \internal --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h -@@ -144,6 +144,9 @@ public: - mutable quint32 connectedSignals; - - QString objectName; +@@ -157,6 +157,9 @@ public: + void sendPendingChildInsertedEvents(); + void removePendingChildInsertedEvents(QObject *child); + #endif +#if defined(Q_WS_X11) + virtual void checkWindowRole(); +#endif - // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions - struct Connection + static Sender *setCurrentSender(QObject *receiver, + Sender *sender); --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h -@@ -360,6 +360,7 @@ public: +@@ -598,6 +598,7 @@ public: + static QWidget *keyboardGrabber; - #if defined(Q_WS_X11) void setWindowRole(); + virtual void checkWindowRole(); void sendStartupMessage(const char *message) const; @@ -62,7 +62,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse void x11UpdateIsOpaque(); --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp -@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId wind +@@ -816,13 +816,17 @@ void QWidgetPrivate::create_sys(WId wind data.fstrut_dirty = 1; // declare the widget's window role @@ -86,7 +86,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse } // set client leader property -@@ -2765,6 +2769,17 @@ void QWidgetPrivate::setWindowRole() +@@ -2893,6 +2897,17 @@ void QWidgetPrivate::setWindowRole() (unsigned char *)windowRole.constData(), windowRole.length()); } diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff index 32a03d4..e69b2f4 100644 --- a/debian/patches/0195-compositing-properties.diff +++ b/debian/patches/0195-compositing-properties.diff @@ -13,7 +13,7 @@ bugs.kde.org number : none --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp -@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId wind +@@ -754,6 +754,11 @@ void QWidgetPrivate::create_sys(WId wind Q_ASSERT(id); XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -25,7 +25,7 @@ bugs.kde.org number : none } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId wind +@@ -807,13 +812,21 @@ void QWidgetPrivate::create_sys(WId wind // set EWMH window types setNetWmWindowTypes(); @@ -49,7 +49,7 @@ bugs.kde.org number : none // declare the widget's window role QByteArray windowRole; -@@ -795,10 +808,6 @@ void QWidgetPrivate::create_sys(WId wind +@@ -833,10 +846,6 @@ void QWidgetPrivate::create_sys(WId wind XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&X11->wm_client_leader, 1); diff --git a/debian/patches/01_qmake_for_debian.diff b/debian/patches/01_qmake_for_debian.diff index 24b2893..618354b 100644 --- a/debian/patches/01_qmake_for_debian.diff +++ b/debian/patches/01_qmake_for_debian.diff @@ -4,8 +4,8 @@ Ensures qmake generates Makefiles that use the -qt4 tools. --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf -@@ -23,8 +23,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL - QMAKE_LIBS_OPENGL_QT = -lGL +@@ -29,8 +29,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc diff --git a/debian/patches/0209-prevent-qt-mixing.diff b/debian/patches/0209-prevent-qt-mixing.diff index 19e98f4..e885cf4 100644 --- a/debian/patches/0209-prevent-qt-mixing.diff +++ b/debian/patches/0209-prevent-qt-mixing.diff @@ -19,14 +19,14 @@ bugs.kde.org number : none --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h -@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO +@@ -83,7 +83,9 @@ void Q_CORE_EXPORT qt_register_signal_sp - inline QObjectData::~QObjectData() {} + extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set; -enum { QObjectPrivateVersion = QT_VERSION }; +// add 0x1000000 to mark it as qt-copy version, with possible modifications +// in some Q*Private class +enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 }; - class Q_CORE_EXPORT QObjectPrivate : public QObjectData + class Q_CORE_EXPORT QDeclarativeData { diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff index d3c2438..9aa0c98 100644 --- a/debian/patches/0216-allow-isystem-for-headers.diff +++ b/debian/patches/0216-allow-isystem-for-headers.diff @@ -27,7 +27,7 @@ bugs.kde.org number : --- a/configure +++ b/configure -@@ -960,6 +960,11 @@ while [ "$#" -gt 0 ]; do +@@ -1019,6 +1019,11 @@ while [ "$#" -gt 0 ]; do VAL=`echo $1 | sed 's,-D,,'` fi ;; @@ -39,7 +39,7 @@ bugs.kde.org number : -I?*|-I) VAR="add_ipath" if [ "$1" = "-I" ]; then -@@ -1930,6 +1935,9 @@ while [ "$#" -gt 0 ]; do +@@ -2009,6 +2014,9 @@ while [ "$#" -gt 0 ]; do add_ipath) I_FLAGS="$I_FLAGS -I\"${VAL}\"" ;; diff --git a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch index 8279576..b35ceac 100644 --- a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch +++ b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch @@ -30,7 +30,7 @@ bugs.kde.org number : 159014 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp -@@ -675,8 +675,8 @@ void QTabBarPrivate::refresh() +@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh() layoutTabs(); makeVisible(currentIndex); q->update(); diff --git a/debian/patches/0255-qtreeview-selection-columns-hidden.diff b/debian/patches/0255-qtreeview-selection-columns-hidden.diff deleted file mode 100644 index a5d3402..0000000 --- a/debian/patches/0255-qtreeview-selection-columns-hidden.diff +++ /dev/null @@ -1,47 +0,0 @@ -From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre@kde.org> -Date: Sun, 26 Oct 2008 10:40:51 +0100 -Subject: [PATCH 08/16] In a treeview with columns like this: - -Column 1 | Column 2 | ... | Column k | ... | Column n - -When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is -hidden, you get double items on the selection model, when asking for selection(). This is becase -ranges are incorrectly calculated when there are hidden columns. A way to reproduce: - -Column 1 | Column 2 | Column 4 (Column 3 is hidden) - item - item - item - x <- press button here and move it up to select items (on this same column) - -If you do like this: - -Column 1 | Column 2 | Column 4 (Column 3 is hidden) - item - item - item - x <- press button here and move it up - -you won't be able to reproduce, since you need the hidden column to be between the one you click and -the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1 -range (even when there are hidden columns). - -qt-bugs@ issue : N232819 -Trolltech task ID : 232831 -bugs.kde.org number : 171436 ---- - src/gui/itemviews/qtreeview.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3577,7 +3577,7 @@ QList<QPair<int, int> > QTreeViewPrivate - current.first = -2; // -1 is not enough because -1+1 = 0 - current.second = -2; - foreach (int logicalColumn, logicalIndexes) { -- if (current.second + 1 != logicalColumn) { -+ if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) { - if (current.first != -2) { - //let's save the current one - ret += current; diff --git a/debian/patches/0274-shm-native-image-fix.diff b/debian/patches/0274-shm-native-image-fix.diff deleted file mode 100644 index 05e414b..0000000 --- a/debian/patches/0274-shm-native-image-fix.diff +++ /dev/null @@ -1,85 +0,0 @@ -From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@nokia.com> -Date: Thu, 25 Jun 2009 13:50:29 +0200 -Subject: [PATCH 12/16] This patch makes the raster graphics system use shared images instead - of shared pixmaps. - -Shared memory pixmaps are deprecated since they are slower than shared -images with modern graphics hardware. They are also not supported by EXA -drivers and can be disabled in the latest version of the NVidia driver. - -qt-bugs@ issue : none -Qt Software task ID : none -bugs.kde.org number : none ---- - src/gui/image/qnativeimage.cpp | 10 ---------- - src/gui/image/qnativeimage_p.h | 1 - - src/gui/painting/qwindowsurface_raster.cpp | 13 ++++++++++--- - 3 files changed, 10 insertions(+), 14 deletions(-) - ---- a/src/gui/image/qnativeimage.cpp -+++ b/src/gui/image/qnativeimage.cpp -@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma - #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM) - - QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget) -- : xshmimg(0), xshmpm(0) -+ : xshmimg(0) - { - if (!X11->use_mitshm) { - image = QImage(width, height, format); -@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in - shmctl(xshminfo.shmid, IPC_RMID, 0); - return; - } -- xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data, -- &xshminfo, width, height, dd); -- if (!xshmpm) { -- qWarning() << "QNativeImage: Unable to create shared Pixmap."; -- } - } - - -@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage() - if (!xshmimg) - return; - -- if (xshmpm) { -- XFreePixmap(X11->display, xshmpm); -- xshmpm = 0; -- } - XShmDetach(X11->display, &xshminfo); - xshmimg->data = 0; - XDestroyImage(xshmimg); ---- a/src/gui/image/qnativeimage_p.h -+++ b/src/gui/image/qnativeimage_p.h -@@ -90,7 +90,6 @@ public: - - #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM) - XImage *xshmimg; -- Pixmap xshmpm; - XShmSegmentInfo xshminfo; - - #elif defined(Q_WS_MAC) ---- a/src/gui/painting/qwindowsurface_raster.cpp -+++ b/src/gui/painting/qwindowsurface_raster.cpp -@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget - - QRect br = rgn.boundingRect().translated(offset); - #ifndef QT_NO_MITSHM -- if (d_ptr->image->xshmpm) { -- XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc, -- br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y()); -+ if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) { -+ const QImage &src = d->image->image; -+ br = br.intersected(src.rect()); -+ // Hack to make sure we satisify the PutImage() constraints in the X server, -+ // since the doShmPutImage() route currently forces a migration to system ram. -+ wbr.setX(wbr.x() - br.x()); -+ br.setX(0); -+ br.setWidth(src.width()); -+ XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg, -+ br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False); - XSync(X11->display, False); - } else - #endif diff --git a/debian/patches/0280-deserialization-custom-dbus-properties.diff b/debian/patches/0280-deserialization-custom-dbus-properties.diff deleted file mode 100644 index 585d9db..0000000 --- a/debian/patches/0280-deserialization-custom-dbus-properties.diff +++ /dev/null @@ -1,49 +0,0 @@ -From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001 -From: George Goldberg <grundleborg@googlemail.com> -Date: Tue, 28 Apr 2009 17:08:07 +0200 -Subject: [PATCH 09/16] This patch fixes deserialization of values with custom types when setting - properties on dbus adaptors. It is needed, in particular by telepathy/Qt - programs and libraries. The bug was reported to Nokia on 2009-01-07 along - with the patch supplied here. The summary of the issue from the Qt - Software task tracker follows: - -When calling the setter for a DBus property, if that property has a custom type -(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the -QDBusArgument before attempting to set the property on the adaptor. The result -is that it attempts to call adaptor->setProperty() with a QDBusArgument of type -"uss" instead of with the type of the custom struct. - -qt-bugs@ issue : N240326 -Qt Software task ID : 240608 -bugs.kde.org number : none ---- - src/dbus/qdbusinternalfilters.cpp | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - ---- a/src/dbus/qdbusinternalfilters.cpp -+++ b/src/dbus/qdbusinternalfilters.cpp -@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBu - QDBusAdaptorConnector::AdaptorMap::ConstIterator it; - it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(), - interface_name); -- if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) -+ if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) { -+ if (value.userType() == qMetaTypeId<QDBusArgument>()) { -+ QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value); -+ if (valueArg.currentType() != -1) { -+ int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType(); -+ void *null = 0; -+ QVariant valueStore(mid, null); -+ QDBusMetaType::demarshall(valueArg, mid, valueStore.data()); -+ -+ if (it->adaptor->setProperty(property_name, valueStore)) -+ return msg.createReply(); -+ } -+ } -+ - if (it->adaptor->setProperty(property_name, value)) - return msg.createReply(); -+ } - } - } - diff --git a/debian/patches/0287-qmenu-respect-minwidth.diff b/debian/patches/0287-qmenu-respect-minwidth.diff deleted file mode 100644 index 430f011..0000000 --- a/debian/patches/0287-qmenu-respect-minwidth.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001 -From: Aaron Seigo <aseigo@kde.org> -Date: Mon, 27 Jul 2009 21:46:22 -0600 -Subject: [PATCH 15/18] Make QMenu respect the minimum width set - -If one sets a minimum width on a QMenu and that size is larger than the -smallest size needed by the large menu item, it ignores the minimum -width and just uses the largest menu item size. - -This results in ugly painting artifacts. This currently affects -(at least) the tasks widget in Plasma in KDE4. ---- - src/gui/widgets/qmenu.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/src/gui/widgets/qmenu.cpp -+++ b/src/gui/widgets/qmenu.cpp -@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap< - - - if (!sz.isEmpty()) { -- max_column_width = qMax(max_column_width, sz.width()); -+ max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width())); - //wrapping - if (!scroll && - y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) { diff --git a/debian/patches/0288-more-x-keycodes.diff b/debian/patches/0288-more-x-keycodes.diff index 6499039..5902504 100644 --- a/debian/patches/0288-more-x-keycodes.diff +++ b/debian/patches/0288-more-x-keycodes.diff @@ -12,7 +12,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h -@@ -895,12 +895,10 @@ public: +@@ -915,12 +915,10 @@ public: Key_Dead_Horn = 0x01001262, // multimedia/internet keys - ignored by default - see QKeyEvent c'tor @@ -25,7 +25,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys Key_VolumeDown = 0x01000070, Key_VolumeMute = 0x01000071, Key_VolumeUp = 0x01000072, -@@ -909,7 +907,6 @@ public: +@@ -929,7 +927,6 @@ public: Key_BassDown = 0x01000075, Key_TrebleUp = 0x01000076, Key_TrebleDown = 0x01000077, @@ -33,7 +33,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys Key_MediaPlay = 0x01000080, Key_MediaStop = 0x01000081, Key_MediaPrevious = 0x01000082, -@@ -918,13 +915,11 @@ public: +@@ -938,13 +935,11 @@ public: #endif Key_MediaNext = 0x01000083, Key_MediaRecord = 0x01000084, @@ -47,7 +47,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys Key_LaunchMail = 0x010000a0, Key_LaunchMedia = 0x010000a1, Key_Launch0 = 0x010000a2, -@@ -943,6 +938,98 @@ public: +@@ -963,6 +958,98 @@ public: Key_LaunchD = 0x010000af, Key_LaunchE = 0x010000b0, Key_LaunchF = 0x010000b1, @@ -468,7 +468,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys XF86XK_Launch2, Qt::Key_Launch4, --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp -@@ -396,47 +396,139 @@ static const struct { +@@ -416,47 +416,139 @@ static const struct { { Qt::Key_Menu, QT_TRANSLATE_NOOP("QShortcut", "Menu") }, { Qt::Key_Help, QT_TRANSLATE_NOOP("QShortcut", "Help") }, diff --git a/debian/patches/0289-context-for-shortcuts-tr.diff b/debian/patches/0289-context-for-shortcuts-tr.diff index 81fef9c..d81cf55 100644 --- a/debian/patches/0289-context-for-shortcuts-tr.diff +++ b/debian/patches/0289-context-for-shortcuts-tr.diff @@ -12,7 +12,7 @@ context to these strings helps creating a more correct translation --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp -@@ -1083,10 +1083,10 @@ int QKeySequencePrivate::decodeString(co +@@ -1139,10 +1139,10 @@ int QKeySequencePrivate::decodeString(co QList<QModifKeyName> modifs; if (nativeText) { @@ -27,7 +27,7 @@ context to these strings helps creating a more correct translation } modifs += *gmodifs; // Test non-translated ones last -@@ -1178,7 +1178,7 @@ QString QKeySequence::encodeString(int k +@@ -1232,7 +1232,7 @@ QString QKeySequence::encodeString(int k static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format) { if (!str.isEmpty()) @@ -36,7 +36,7 @@ context to these strings helps creating a more correct translation : QString::fromLatin1("+"); str += theKey; } -@@ -1203,13 +1203,13 @@ QString QKeySequencePrivate::encodeStrin +@@ -1272,13 +1272,13 @@ QString QKeySequencePrivate::encodeStrin { // On other systems the order is Meta, Control, Alt, Shift if ((key & Qt::META) == Qt::META) @@ -54,7 +54,7 @@ context to these strings helps creating a more correct translation } -@@ -1224,7 +1224,7 @@ QString QKeySequencePrivate::encodeStrin +@@ -1293,7 +1293,7 @@ QString QKeySequencePrivate::encodeStrin p += QChar((key-0x10000)%400+0xdc00); } } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) { diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff index 33e1ef1..71d4189 100644 --- a/debian/patches/05_append_qt4_target.diff +++ b/debian/patches/05_append_qt4_target.diff @@ -2,15 +2,15 @@ author: Fathi Boudra <fabo@debian.org> --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test -@@ -61,7 +61,7 @@ cd "$OUTDIR/$TEST" +@@ -66,7 +66,7 @@ cd "$OUTDIR/$TEST" - test -r Makefile && make distclean >/dev/null 2>&1 + test -r Makefile && $MAKE distclean >/dev/null 2>&1 -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then - make + $MAKE --- a/config.tests/unix/doubleformat.test +++ b/config.tests/unix/doubleformat.test @@ -10,7 +10,7 @@ OUTDIR=$4 @@ -57,7 +57,7 @@ author: Fathi Boudra <fabo@debian.org> if [ "$VERBOSE" = "yes" ]; then --- a/configure +++ b/configure -@@ -4077,7 +4077,7 @@ END { +@@ -4209,7 +4209,7 @@ END { } # build qmake @@ -66,7 +66,7 @@ author: Fathi Boudra <fabo@debian.org> echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -6737,8 +6737,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR +@@ -7070,8 +7070,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR @@ -77,7 +77,7 @@ author: Fathi Boudra <fabo@debian.org> QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp -@@ -7088,11 +7088,11 @@ EXEC="" +@@ -7447,11 +7447,11 @@ EXEC="" #------------------------------------------------------------------------------- echo "Finding project files. Please wait..." @@ -91,7 +91,7 @@ author: Fathi Boudra <fabo@debian.org> fi # .projects -> projects to process -@@ -7265,7 +7265,7 @@ for file in .projects .projects.3; do +@@ -7625,7 +7625,7 @@ for file in .projects .projects.3; do echo " for $a\c" fi @@ -102,7 +102,7 @@ author: Fathi Boudra <fabo@debian.org> if echo '\c' | grep '\c' >/dev/null; then --- a/projects.pro +++ b/projects.pro -@@ -119,7 +119,7 @@ qmake.path=$$[QT_INSTALL_BINS] +@@ -137,7 +137,7 @@ qmake.path=$$[QT_INSTALL_BINS] win32 { qmake.files=$$QT_BUILD_TREE/bin/qmake.exe } else { @@ -113,7 +113,7 @@ author: Fathi Boudra <fabo@debian.org> --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix -@@ -99,17 +99,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators +@@ -70,17 +70,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) @@ -184,7 +184,7 @@ author: Fathi Boudra <fabo@debian.org> --- a/tools/designer/src/designer/designer.pro +++ b/tools/designer/src/designer/designer.pro -@@ -24,7 +24,7 @@ contains(CONFIG, static) { +@@ -25,7 +25,7 @@ contains(CONFIG, static) { DEFINES += QT_DESIGNER_STATIC } @@ -195,7 +195,7 @@ author: Fathi Boudra <fabo@debian.org> include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri) --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro -@@ -67,7 +67,7 @@ HEADERS += \ +@@ -69,7 +69,7 @@ HEADERS += \ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES += QT_KEYWORDS diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff index 37a0fa8..8527e54 100644 --- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff +++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff @@ -4,7 +4,7 @@ Trolltech task ID : 181882 --- a/configure +++ b/configure -@@ -125,7 +125,50 @@ getQMakeConf() +@@ -154,7 +154,50 @@ linkerSupportsFlag() #------------------------------------------------------------------------------- # need that throughout the script diff --git a/debian/patches/09_qmake_lflags_as-needed.diff b/debian/patches/09_qmake_lflags_as-needed.diff index a559d64..f56f44a 100644 --- a/debian/patches/09_qmake_lflags_as-needed.diff +++ b/debian/patches/09_qmake_lflags_as-needed.diff @@ -5,7 +5,7 @@ Bug reported to Trolltech. --- a/configure +++ b/configure -@@ -614,6 +614,8 @@ mkdir -p "$outpath/config.tests" +@@ -643,6 +643,8 @@ mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" @@ -13,4 +13,4 @@ Bug reported to Trolltech. + QMakeVar add styles "cde mac motif plastique cleanlooks windows" QMakeVar add decorations "default windows styled" - QMakeVar add gfx-drivers "linuxfb" + QMakeVar add mouse-drivers "pc" diff --git a/debian/patches/11_build_translations.diff b/debian/patches/11_build_translations.diff index f5df690..bd7bb59 100644 --- a/debian/patches/11_build_translations.diff +++ b/debian/patches/11_build_translations.diff @@ -3,50 +3,20 @@ author: Fathi Boudra <fabo@debian.org> translations fails to build under autobuilders. Use case: Qt sources comes from git and we need to build them. ---- /dev/null +--- a/tools/assistant/translations/qt_help.pro +++ b/tools/assistant/translations/qt_help.pro -@@ -0,0 +1,50 @@ -+# Include those manually as they do not contain any directory specification -+ -+SOURCES += ../lib/qhelpcollectionhandler.cpp \ -+ ../lib/qhelpcontentwidget.cpp \ -+ ../lib/qhelpdatainterface.cpp \ -+ ../lib/qhelpdbreader.cpp \ -+ ../lib/qhelpengine.cpp \ -+ ../lib/qhelpenginecore.cpp \ -+ ../lib/qhelpgenerator.cpp \ -+ ../lib/qhelpindexwidget.cpp \ -+ ../lib/qhelpprojectdata.cpp \ -+ ../lib/qhelpsearchengine.cpp \ -+ ../lib/qhelpsearchindexreader_clucene.cpp \ -+ ../lib/qhelpsearchindexreader_default.cpp \ -+ ../lib/qhelpsearchindexwriter_clucene.cpp \ -+ ../lib/qhelpsearchindexwriter_default.cpp \ -+ ../lib/qhelpsearchindex_default.cpp \ -+ ../lib/qhelpsearchquerywidget.cpp \ -+ ../lib/qhelpsearchresultwidget.cpp -+ -+HEADERS += ../lib/qhelpcollectionhandler_p.h \ -+ ../lib/qhelpcontentwidget.h \ -+ ../lib/qhelpdatainterface_p.h \ -+ ../lib/qhelpdbreader_p.h \ -+ ../lib/qhelpengine.h \ -+ ../lib/qhelpenginecore.h \ -+ ../lib/qhelpengine_p.h \ -+ ../lib/qhelpgenerator_p.h \ -+ ../lib/qhelpindexwidget.h \ -+ ../lib/qhelpprojectdata_p.h \ -+ ../lib/qhelpsearchengine.h \ -+ ../lib/qhelpsearchindexreader_clucene_p.h \ -+ ../lib/qhelpsearchindexreader_default_p.h \ -+ ../lib/qhelpsearchindexwriter_clucene_p.h \ -+ ../lib/qhelpsearchindexwriter_default_p.h \ -+ ../lib/qhelpsearchindex_default_p.h \ -+ ../lib/qhelpsearchquerywidget.h \ -+ ../lib/qhelpsearchresultwidget.h \ -+ ../lib/qhelp_global.h -+ -+ +@@ -39,12 +39,12 @@ HEADERS += ../lib/qhelpcollectionhandler + ../lib/qhelp_global.h + + +-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_ru.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/qt_help_da.ts +TRANSLATIONS=../../../translations/qt_help_de.ts \ + ../../../translations/qt_help_ja.ts \ + ../../../translations/qt_help_pl.ts \ @@ -55,52 +25,21 @@ Use case: Qt sources comes from git and we need to build them. + ../../../translations/qt_help_zh_CN.ts \ + ../../../translations/qt_help_zh_TW.ts \ + ../../../translations/qt_help_da.ts -+error("This is a dummy profile to be used for translations ONLY.") ---- /dev/null + error("This is a dummy profile to be used for translations ONLY.") +--- a/tools/assistant/translations/translations.pro +++ b/tools/assistant/translations/translations.pro -@@ -0,0 +1,50 @@ -+# Include those manually as they do not contain any directory specification -+ -+FORMS += ../tools/assistant/filternamedialog.ui \ -+ ../tools/assistant/installdialog.ui \ -+ ../tools/assistant/preferencesdialog.ui \ -+ ../tools/assistant/topicchooser.ui \ -+ ../tools/assistant/bookmarkdialog.ui -+ -+SOURCES += ../tools/assistant/aboutdialog.cpp \ -+ ../tools/assistant/bookmarkmanager.cpp \ -+ ../tools/assistant/centralwidget.cpp \ -+ ../tools/assistant/cmdlineparser.cpp \ -+ ../tools/assistant/contentwindow.cpp \ -+ ../tools/assistant/filternamedialog.cpp \ -+ ../tools/assistant/helpviewer.cpp \ -+ ../tools/assistant/indexwindow.cpp \ -+ ../tools/assistant/installdialog.cpp \ -+ ../tools/assistant/main.cpp \ -+ ../tools/assistant/mainwindow.cpp \ -+ ../tools/assistant/preferencesdialog.cpp \ -+ ../tools/assistant/remotecontrol.cpp \ -+ ../tools/assistant/searchwidget.cpp \ -+ ../tools/assistant/topicchooser.cpp \ -+ -+SOURCES += ../../shared/fontpanel/fontpanel.cpp -+ -+HEADERS += ../tools/assistant/aboutdialog.h \ -+ ../tools/assistant/bookmarkmanager.h \ -+ ../tools/assistant/centralwidget.h \ -+ ../tools/assistant/cmdlineparser.h \ -+ ../tools/assistant/contentwindow.h \ -+ ../tools/assistant/filternamedialog.h \ -+ ../tools/assistant/helpviewer.h \ -+ ../tools/assistant/indexwindow.h \ -+ ../tools/assistant/installdialog.h \ -+ ../tools/assistant/mainwindow.h \ -+ ../tools/assistant/preferencesdialog.h \ -+ ../tools/assistant/remotecontrol.h \ -+ ../tools/assistant/remotecontrol_win.h \ -+ ../tools/assistant/searchwidget.h \ -+ ../tools/assistant/topicchooser.h \ -+ +@@ -40,11 +40,11 @@ HEADERS += ../tools/assistant/aboutdialo + ../tools/assistant/searchwidget.h \ + ../tools/assistant/topicchooser.h \ + +-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_ru.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_da.ts +TRANSLATIONS=../../../translations/assistant_de.ts \ + ../../../translations/assistant_ja.ts \ + ../../../translations/assistant_pl.ts \ @@ -109,42 +48,19 @@ Use case: Qt sources comes from git and we need to build them. + ../../../translations/assistant_zh_CN.ts \ + ../../../translations/assistant_zh_TW.ts \ + ../../../translations/assistant_da.ts ---- /dev/null +--- a/tools/assistant/translations/translations_adp.pro +++ b/tools/assistant/translations/translations_adp.pro -@@ -0,0 +1,41 @@ -+# Include those manually as they do not contain any directory specification -+ -+FORMS += ../compat/helpdialog.ui \ -+ ../compat/mainwindow.ui \ -+ ../compat/tabbedbrowser.ui \ -+ ../compat/topicchooser.ui -+ -+SOURCES += ../compat/main.cpp \ -+ ../compat/helpwindow.cpp \ -+ ../compat/topicchooser.cpp \ -+ ../compat/docuparser.cpp \ -+ ../compat/index.cpp \ -+ ../compat/profile.cpp \ -+ ../compat/config.cpp \ -+ ../compat/helpdialog.cpp \ -+ ../compat/mainwindow.cpp \ -+ ../compat/tabbedbrowser.cpp \ -+ ../compat/fontsettingsdialog.cpp -+ -+SOURCES += ../../shared/fontpanel/fontpanel.cpp -+ -+HEADERS += ../compat/helpwindow.h \ -+ ../compat/topicchooser.h \ -+ ../compat/docuparser.h \ -+ ../compat/index.h \ -+ ../compat/profile.h \ -+ ../compat/helpdialog.h \ -+ ../compat/mainwindow.h \ -+ ../compat/tabbedbrowser.h \ -+ ../compat/config.h \ -+ ../compat/fontsettingsdialog.h -+ -+ +@@ -31,11 +31,11 @@ HEADERS += ../compat/helpwindow.h \ + ../compat/fontsettingsdialog.h + + +-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ru.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts +TRANSLATIONS=../../../translations/assistant_adp_de.ts \ + ../../../translations/assistant_adp_ja.ts \ + ../../../translations/assistant_adp_pl.ts \ @@ -152,140 +68,35 @@ Use case: Qt sources comes from git and we need to build them. + ../../../translations/assistant_adp_untranslated.ts \ + ../../../translations/assistant_adp_zh_CN.ts \ + ../../../translations/assistant_adp_zh_TW.ts -+error("This is a dummy profile to be used for translations ONLY.") ---- /dev/null + error("This is a dummy profile to be used for translations ONLY.") +--- a/tools/designer/translations/translations.pro +++ b/tools/designer/translations/translations.pro -@@ -0,0 +1,124 @@ -+include(../src/components/buddyeditor/buddyeditor.pri) -+include(../src/components/component.pri) -+include(../src/components/formeditor/formeditor.pri) -+include(../src/components/objectinspector/objectinspector.pri) -+include(../src/components/propertyeditor/propertyeditor.pri) -+include(../src/components/signalsloteditor/signalsloteditor.pri) -+include(../src/components/tabordereditor/tabordereditor.pri) -+include(../src/components/taskmenu/taskmenu.pri) -+include(../src/components/widgetbox/widgetbox.pri) -+include(../src/lib/extension/extension.pri) -+include(../src/lib/sdk/sdk.pri) -+include(../src/lib/shared/shared.pri) -+include(../src/lib/uilib/uilib.pri) -+include(../../shared/qttoolbardialog/qttoolbardialog.pri) -+include(../../shared/qtpropertybrowser/qtpropertybrowser.pri) -+include(../../shared/qtgradienteditor/qtgradienteditor.pri) -+ -+# Include Qt3Support plugin -+ -+SOURCES += ../src/plugins/widgets/qt3supportwidgets.cpp -+HEADERS += ../src/plugins/widgets/q3iconview/q3iconview_extrainfo.h \ -+ ../src/plugins/widgets/q3iconview/q3iconview_plugin.h \ -+ ../src/plugins/widgets/q3listview/q3listview_extrainfo.h \ -+ ../src/plugins/widgets/q3listview/q3listview_plugin.h \ -+ ../src/plugins/widgets/q3mainwindow/q3mainwindow_container.h \ -+ ../src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h \ -+ ../src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h \ -+ ../src/plugins/widgets/q3toolbar/q3toolbar_plugin.h \ -+ ../src/plugins/widgets/q3widgetstack/q3widgetstack_container.h \ -+ ../src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h \ -+ ../src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h \ -+ ../src/plugins/widgets/q3wizard/q3wizard_container.h \ -+ ../src/plugins/widgets/q3wizard/q3wizard_plugin.h \ -+ ../src/plugins/widgets/q3listbox/q3listbox_extrainfo.h \ -+ ../src/plugins/widgets/q3listbox/q3listbox_plugin.h \ -+ ../src/plugins/widgets/q3table/q3table_extrainfo.h \ -+ ../src/plugins/widgets/q3table/q3table_plugin.h \ -+ ../src/plugins/widgets/q3textedit/q3textedit_extrainfo.h \ -+ ../src/plugins/widgets/q3textedit/q3textedit_plugin.h \ -+ ../src/plugins/widgets/q3widgets/q3widget_plugins.h -+ -+SOURCES += ../src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp \ -+ ../src/plugins/widgets/q3iconview/q3iconview_plugin.cpp \ -+ ../src/plugins/widgets/q3listview/q3listview_extrainfo.cpp \ -+ ../src/plugins/widgets/q3listview/q3listview_plugin.cpp \ -+ ../src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp \ -+ ../src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp \ -+ ../src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp \ -+ ../src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp \ -+ ../src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp \ -+ ../src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp \ -+ ../src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp \ -+ ../src/plugins/widgets/q3wizard/q3wizard_container.cpp \ -+ ../src/plugins/widgets/q3wizard/q3wizard_plugin.cpp \ -+ ../src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp \ -+ ../src/plugins/widgets/q3listbox/q3listbox_plugin.cpp \ -+ ../src/plugins/widgets/q3table/q3table_extrainfo.cpp \ -+ ../src/plugins/widgets/q3table/q3table_plugin.cpp \ -+ ../src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp \ -+ ../src/plugins/widgets/q3textedit/q3textedit_plugin.cpp \ -+ ../src/plugins/widgets/q3widgets/q3widget_plugins.cpp -+ -+# Include those manually as they do not contain any directory specification -+APP_DIR=../src/designer -+SOURCES += $$APP_DIR/appfontdialog.cpp \ -+ $$APP_DIR/assistantclient.cpp \ -+ $$APP_DIR/main.cpp \ -+ $$APP_DIR/mainwindow.cpp \ -+ $$APP_DIR/newform.cpp \ -+ $$APP_DIR/plugindialog.cpp \ -+ $$APP_DIR/preferencesdialog.cpp \ -+ $$APP_DIR/qdesigner_actions.cpp \ -+ $$APP_DIR/qdesigner_appearanceoptions.cpp \ -+ $$APP_DIR/qdesigner.cpp \ -+ $$APP_DIR/qdesigner_formwindow.cpp \ -+ $$APP_DIR/qdesigner_server.cpp \ -+ $$APP_DIR/qdesigner_settings.cpp \ -+ $$APP_DIR/qdesigner_toolwindow.cpp \ -+ $$APP_DIR/qdesigner_workbench.cpp \ -+ $$APP_DIR/saveformastemplate.cpp \ -+ $$APP_DIR/versiondialog.cpp -+ -+HEADERS+= $$APP_DIR/appfontdialog.h \ -+ $$APP_DIR/assistantclient.h \ -+ $$APP_DIR/designer_enums.h \ -+ $$APP_DIR/mainwindow.h \ -+ $$APP_DIR/newform.h \ -+ $$APP_DIR/plugindialog.h \ -+ $$APP_DIR/preferencesdialog.h \ -+ $$APP_DIR/qdesigner_actions.h \ -+ $$APP_DIR/qdesigner_appearanceoptions.h \ -+ $$APP_DIR/qdesigner_formwindow.h \ -+ $$APP_DIR/qdesigner.h \ -+ $$APP_DIR/qdesigner_pch.h \ -+ $$APP_DIR/qdesigner_server.h \ -+ $$APP_DIR/qdesigner_settings.h \ -+ $$APP_DIR/qdesigner_toolwindow.h \ -+ $$APP_DIR/qdesigner_workbench.h \ -+ $$APP_DIR/saveformastemplate.h \ -+ $$APP_DIR/versiondialog.h -+ -+FORMS += $$APP_DIR/plugindialog.ui \ -+ $$APP_DIR/preferencesdialog.ui \ -+ $$APP_DIR/qdesigner_appearanceoptions.ui \ -+ $$APP_DIR/saveformastemplate.ui -+ -+# Shared solutions -+SOURCES += ../../shared/fontpanel/fontpanel.cpp \ -+ ../../shared/deviceskin/deviceskin.cpp \ -+ ../../shared/findwidget/abstractfindwidget.cpp \ -+ ../../shared/findwidget/itemviewfindwidget.cpp \ -+ ../../shared/findwidget/texteditfindwidget.cpp \ -+ -+HEADERS += ../../shared/findwidget/abstractfindwidget.h \ -+ ../../shared/findwidget/itemviewfindwidget.h \ -+ ../../shared/findwidget/texteditfindwidget.h -+ +@@ -130,11 +130,11 @@ HEADERS += ../../shared/findwidget/abstr + ../../shared/findwidget/itemviewfindwidget.h \ + ../../shared/findwidget/texteditfindwidget.h + +-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_ru.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_sl.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \ +- $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts +TRANSLATIONS=../../../translations/designer_de.ts \ + ../../../translations/designer_ja.ts \ + ../../../translations/designer_pl.ts \ + ../../../translations/designer_ru.ts \ ++ ../../../translations/designer_sl.ts \ + ../../../translations/designer_zh_CN.ts \ + ../../../translations/designer_zh_TW.ts \ + ../../../translations/designer_untranslated.ts --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro -@@ -96,11 +96,11 @@ FORMS += statistics.ui \ +@@ -95,11 +95,11 @@ FORMS += statistics.ui \ finddialog.ui RESOURCES += linguist.qrc - + -TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \ - $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \ - $$[QT_INSTALL_TRANSLATIONS]/linguist_ru.ts \ @@ -305,9 +116,9 @@ Use case: Qt sources comes from git and we need to build them. --- a/tools/qtconfig/translations/translations.pro +++ b/tools/qtconfig/translations/translations.pro @@ -7,8 +7,8 @@ HEADERS += ../colorbutton.h ../pr - + FORMS = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui - + -TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \ - $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \ - $$[QT_INSTALL_TRANSLATIONS]/qtconfig_untranslated.ts \ @@ -323,7 +134,7 @@ Use case: Qt sources comes from git and we need to build them. @@ -26,8 +26,8 @@ SOURCES = ../qvfb.cpp \ ../qwssignalhandler.cpp \ ../../shared/deviceskin/deviceskin.cpp - + -TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qvfb_pl.ts \ - $$[QT_INSTALL_TRANSLATIONS]/qvfb_ru.ts \ - $$[QT_INSTALL_TRANSLATIONS]/qvfb_untranslated.ts \ @@ -336,32 +147,24 @@ Use case: Qt sources comes from git and we need to build them. + ../../../translations/qvfb_zh_TW.ts --- a/translations/translations.pri +++ b/translations/translations.pri -@@ -26,7 +26,6 @@ QT_TS = de fr zh_CN untranslated - ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ - 3rdparty/phonon \ - 3rdparty/webkit \ -- activeqt \ - corelib \ - gui \ - network \ -@@ -38,10 +37,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/sr +@@ -41,10 +41,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/sr svg \ xml \ xmlpatterns \ - -ts $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts)) + -ts $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts)) ts-qt.depends = sub-tools - + -qm-qt.commands = $$LRELEASE $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts) +qm-qt.commands = $$LRELEASE $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts) qm-qt.depends = sub-tools - + ###### Designer --- a/tools/assistant/compat/translations/translations.pro +++ b/tools/assistant/compat/translations/translations.pro @@ -31,4 +31,4 @@ HEADERS += ../helpwindow.h \ ../fontsettingsdialog.h - - + + -TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts +TRANSLATIONS=$$QT_SOURCE_TREE/translations/assistant_de.ts $$QT_SOURCE_TREE/translations/assistant_untranslated.ts diff --git a/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff b/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff deleted file mode 100644 index 953aaad..0000000 --- a/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff +++ /dev/null @@ -1,23 +0,0 @@ -author: Sune Vuorela <sune@debian.org> - ---- a/src/gui/kernel/kernel.pri -+++ b/src/gui/kernel/kernel.pri -@@ -146,6 +146,7 @@ embedded { - HEADERS += \ - kernel/qeventdispatcher_glib_qws_p.h - QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB -+ LIBS +=$$QT_LIBS_GLIB - } - - ---- a/src/gui/painting/painting.pri -+++ b/src/gui/painting/painting.pri -@@ -79,6 +79,8 @@ SOURCES += \ - painting/qtextureglyphcache.cpp \ - painting/qtransform.cpp \ - -+ LIBS += -lz -+ - DEFINES += QT_RASTER_IMAGEENGINE - win32:DEFINES += QT_RASTER_PAINTENGINE - embedded:DEFINES += QT_RASTER_PAINTENGINE diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff index 6e5a981..b31b7c7 100644 --- a/debian/patches/15_fix_qmake_makefile_generation.diff +++ b/debian/patches/15_fix_qmake_makefile_generation.diff @@ -1,6 +1,6 @@ --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -2333,7 +2333,7 @@ MakefileGenerator::writeSubTargets(QText +@@ -2383,7 +2383,7 @@ MakefileGenerator::writeSubTargets(QText QString mkfile = subtarget->makefile; if(!in_directory.isEmpty()) diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff index c54b5ba..e8e2063 100644 --- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff +++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff @@ -1,13 +1,13 @@ --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri -@@ -26,6 +26,7 @@ CONFIG(release) { +@@ -38,6 +38,7 @@ CONFIG(release, debug|release) { BASE_DIR = $$PWD INCLUDEPATH += $$PWD/WebKit/qt/Api +QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter - # - # For builds inside Qt we interpret the output rule and the input of each extra compiler manually + CONFIG -= warn_on + *-g++*:QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing --- /dev/null +++ b/src/3rdparty/webkit/symbols.filter @@ -0,0 +1,5 @@ diff --git a/debian/patches/17_add_postgresql_8.3_support.diff b/debian/patches/17_add_postgresql_8.3_support.diff index fa2e470..0cc11d3 100644 --- a/debian/patches/17_add_postgresql_8.3_support.diff +++ b/debian/patches/17_add_postgresql_8.3_support.diff @@ -2,7 +2,7 @@ Enable PostgreSQL 8.3 support. --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp -@@ -659,9 +659,12 @@ static QPSQLDriver::Protocol getPSQLVers +@@ -656,9 +656,12 @@ static QPSQLDriver::Protocol getPSQLVers serverVersion = QPSQLDriver::Version81; break; case 2: @@ -16,7 +16,7 @@ Enable PostgreSQL 8.3 support. } break; default: -@@ -956,6 +959,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons +@@ -963,6 +966,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons case QPSQLDriver::Version8: case QPSQLDriver::Version81: case QPSQLDriver::Version82: @@ -24,7 +24,7 @@ Enable PostgreSQL 8.3 support. stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " "pg_class.relname " "FROM pg_attribute, pg_class " -@@ -1029,6 +1033,7 @@ QSqlRecord QPSQLDriver::record(const QSt +@@ -1046,6 +1050,7 @@ QSqlRecord QPSQLDriver::record(const QSt case QPSQLDriver::Version8: case QPSQLDriver::Version81: case QPSQLDriver::Version82: diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff index f07b2ad..87e2f53 100644 --- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff +++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff @@ -5,16 +5,15 @@ This patch enable them. --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro -@@ -2030,9 +2030,3 @@ HEADERS += $$WEBKIT_API_HEADERS - } - } - --CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) { -- # start with 4.5 +@@ -3321,8 +3321,6 @@ HEADERS += $$WEBKIT_API_HEADERS + CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) { + # start with 4.5 + # Remove the following 2 lines if you want debug information in WebCore - CONFIG -= separate_debug_info - CONFIG += no_debug_info --} -- + } + + !win32-g++:win32:contains(QMAKE_HOST.arch, x86_64):{ --- a/src/qt3support/qt3support.pro +++ b/src/qt3support/qt3support.pro @@ -34,6 +34,3 @@ MOCDIR = .moc diff --git a/debian/patches/19_install_qdoc3.diff b/debian/patches/19_install_qdoc3.diff index bd0c2b4..3007e0a 100644 --- a/debian/patches/19_install_qdoc3.diff +++ b/debian/patches/19_install_qdoc3.diff @@ -1,6 +1,6 @@ --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro -@@ -99,3 +99,7 @@ SOURCES += apigenerator.cpp \ +@@ -105,3 +105,7 @@ SOURCES += apigenerator.cpp \ webxmlgenerator.cpp \ yyindent.cpp @@ -10,11 +10,11 @@ + --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -13,6 +13,7 @@ no-png { +@@ -14,6 +14,7 @@ no-png { SUBDIRS += designer } SUBDIRS += linguist + SUBDIRS += qdoc3 + symbian: SUBDIRS = designer wince*: SUBDIRS = qtestlib designer unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff index 57cb5a7..ab04517 100644 --- a/debian/patches/30_webkit_unaligned_access.diff +++ b/debian/patches/30_webkit_unaligned_access.diff @@ -14,7 +14,7 @@ a real problem yet. --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp -@@ -1936,13 +1936,13 @@ static TCMalloc_Central_FreeListPadded c +@@ -2255,13 +2255,13 @@ static TCMalloc_Central_FreeListPadded c // Page-level allocator static SpinLock pageheap_lock = SPINLOCK_INITIALIZER; @@ -64,7 +64,7 @@ a real problem yet. template<typename ValueArg> struct ListHashSetNode { --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h -@@ -233,6 +233,23 @@ +@@ -318,6 +318,23 @@ # endif #endif @@ -94,8 +94,8 @@ a real problem yet. if (string->length() != length) return false; --#if PLATFORM(ARM) -+#if PLATFORM(ARM) || PLATFORM(SPARC) +-#if PLATFORM(ARM) || PLATFORM(SH4) ++#if PLATFORM(ARM) || PLATFORM(SH4) || PLATFORM(SPARC) const UChar* stringCharacters = string->characters(); for (unsigned i = 0; i != length; ++i) { if (*stringCharacters++ != *characters++) diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff index 6d85a4f..c19315d 100644 --- a/debian/patches/40_alpha_ice.diff +++ b/debian/patches/40_alpha_ice.diff @@ -1,40 +1,36 @@ --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -76,14 +76,7 @@ class QLibraryInfoPrivate +@@ -75,12 +75,7 @@ class QLibraryInfoPrivate { public: static QSettings *findConfiguration(); - static void cleanup() - { - QLibrarySettings *ls = qt_library_settings(); -- if (ls) { -- delete static_cast<QSettings *>(ls->settings); -- ls->settings = 0; -- } +- if (ls) +- ls->settings.reset(0); - } + static void cleanup(); static QSettings *configuration() { - #ifdef QT_NO_THREAD -@@ -102,6 +95,15 @@ public: + QLibrarySettings *ls = qt_library_settings(); +@@ -88,6 +83,13 @@ public: } }; +void QLibraryInfoPrivate::cleanup() +{ + QLibrarySettings *ls = qt_library_settings(); -+ if (ls) { -+ delete static_cast<QSettings *>(ls->settings); -+ ls->settings = 0; -+ } ++ if (ls) ++ ls->settings.reset(0); +} + QLibrarySettings::QLibrarySettings() + : settings(QLibraryInfoPrivate::findConfiguration()) { - settings = QLibraryInfoPrivate::findConfiguration(); --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h -@@ -494,7 +494,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de +@@ -510,7 +510,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de } template <class Key, class T> diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff index 67bf36c..c32115e 100644 --- a/debian/patches/41_disable_opengl_visibility.diff +++ b/debian/patches/41_disable_opengl_visibility.diff @@ -2,11 +2,11 @@ temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed. --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro -@@ -51,6 +51,7 @@ contains(QT_CONFIG, opengles2) { - gl2paintengineex/qpaintengineex_opengl2_p.h - } +@@ -42,6 +42,7 @@ SOURCES += qgl.cpp \ + qglextensions.cpp \ + qglpaintdevice.cpp \ +QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden - x11 { - contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONFIG, opengles2) { + !contains(QT_CONFIG, opengles2) { + HEADERS += qpaintengine_opengl_p.h diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff index c57fbb1..6cfa05b 100644 --- a/debian/patches/50_kfreebsd_build_fix.diff +++ b/debian/patches/50_kfreebsd_build_fix.diff @@ -4,7 +4,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h -@@ -213,6 +213,12 @@ namespace QT_NAMESPACE {} +@@ -218,6 +218,12 @@ namespace QT_NAMESPACE {} # define Q_OS_RELIANT #elif defined(__linux__) || defined(__linux) # define Q_OS_LINUX @@ -17,7 +17,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. #elif defined(__FreeBSD__) || defined(__DragonFly__) # define Q_OS_FREEBSD # define Q_OS_BSD4 -@@ -233,8 +239,6 @@ namespace QT_NAMESPACE {} +@@ -238,8 +244,6 @@ namespace QT_NAMESPACE {} # define Q_OS_AIX #elif defined(__Lynx__) # define Q_OS_LYNX @@ -28,9 +28,9 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. #elif defined(__QNXNTO__) --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp -@@ -290,13 +290,13 @@ static bool qt_parse_pattern(const char +@@ -295,13 +295,13 @@ static bool qt_parse_pattern(const char - #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_PLUGIN_CHECK) + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK) -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX) +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC) @@ -46,7 +46,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. const char *pattern, ulong p_len) --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp -@@ -78,7 +78,7 @@ QT_END_NAMESPACE +@@ -77,7 +77,7 @@ QT_END_NAMESPACE #include <qdebug.h> #include <time.h> @@ -55,7 +55,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. # include <fenv.h> #endif -@@ -6544,7 +6544,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in +@@ -6537,7 +6537,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in _control87(MCW_EM, MCW_EM); #endif @@ -64,7 +64,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. fenv_t envp; feholdexcept(&envp); #endif -@@ -6560,7 +6560,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in +@@ -6553,7 +6553,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in #endif //_M_X64 #endif //Q_OS_WIN diff --git a/debian/patches/81_hurd_clock_gettime.diff b/debian/patches/81_hurd_clock_gettime.diff index d6a2708..17f7315 100644 --- a/debian/patches/81_hurd_clock_gettime.diff +++ b/debian/patches/81_hurd_clock_gettime.diff @@ -8,13 +8,13 @@ Debian bug #533526 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp -@@ -49,6 +49,9 @@ - +@@ -46,6 +46,9 @@ + #include <mach/mach_time.h> + #include <unistd.h> #elif defined(Q_OS_UNIX) - +#if defined(Q_OS_HURD) +#include <sys/time.h> +#endif #include <time.h> #include <unistd.h> - + #elif defined(Q_OS_WIN) diff --git a/debian/patches/91_s390_-gstabs.diff b/debian/patches/91_s390_-gstabs.diff index 3b19a9a..d7b2928 100644 --- a/debian/patches/91_s390_-gstabs.diff +++ b/debian/patches/91_s390_-gstabs.diff @@ -8,7 +8,7 @@ Debian bug 528485 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri -@@ -24,6 +24,14 @@ CONFIG(release) { +@@ -36,6 +36,14 @@ CONFIG(release, debug|release) { DEFINES += NDEBUG } diff --git a/debian/patches/series b/debian/patches/series index 9dcca04..04bb02a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,12 +4,8 @@ 0209-prevent-qt-mixing.diff 0216-allow-isystem-for-headers.diff 0225-invalidate-tabbar-geometry-on-refresh.patch -0255-qtreeview-selection-columns-hidden.diff -0274-shm-native-image-fix.diff -0280-deserialization-custom-dbus-properties.diff 0288-more-x-keycodes.diff 0289-context-for-shortcuts-tr.diff -0287-qmenu-respect-minwidth.diff # debian patches 01_qmake_for_debian.diff @@ -21,7 +17,6 @@ 09_qmake_lflags_as-needed.diff 10_config_tests_fixes.diff 11_build_translations.diff -14_add_libraries_to_gui_build_where_actually_needed.diff 15_fix_qmake_makefile_generation.diff 16_hide_std_symbols_on_qtwebkit.diff 17_add_postgresql_8.3_support.diff diff --git a/debian/qt4-demos-dbg.install b/debian/qt4-demos-dbg.install index 82de139..6e15973 100644 --- a/debian/qt4-demos-dbg.install +++ b/debian/qt4-demos-dbg.install @@ -10,12 +10,19 @@ usr/lib/qt4/demos/embeddeddialogs/embeddeddialogs.debug usr/lib/qt4/demos/gradients/gradients.debug usr/lib/qt4/demos/interview/interview.debug usr/lib/qt4/demos/mainwindow/mainwindow.debug -usr/lib/qt4/demos/mediaplayer/mediaplayer.debug +usr/lib/qt4/demos/mediaplayer/qmediaplayer.debug usr/lib/qt4/demos/pathstroke/pathstroke.debug usr/lib/qt4/demos/spreadsheet/spreadsheet.debug usr/lib/qt4/demos/sqlbrowser/sqlbrowser.debug +usr/lib/qt4/demos/sub-attaq/sub-attaq.debug usr/lib/qt4/demos/textedit/textedit.debug usr/lib/qt4/demos/undo/undo.debug +usr/lib/qt4/examples/animation/animatedtiles/animatedtiles.debug +usr/lib/qt4/examples/animation/appchooser/appchooser.debug +usr/lib/qt4/examples/animation/easing/easing.debug +usr/lib/qt4/examples/animation/moveblocks/moveblocks.debug +usr/lib/qt4/examples/animation/states/states.debug +usr/lib/qt4/examples/animation/stickman/stickman.debug usr/lib/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug usr/lib/qt4/examples/dbus/chat/dbus-chat.debug usr/lib/qt4/examples/dbus/complexpingpong/complexping.debug @@ -44,6 +51,12 @@ usr/lib/qt4/examples/draganddrop/draggabletext/draggabletext.debug usr/lib/qt4/examples/draganddrop/dropsite/dropsite.debug usr/lib/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.debug usr/lib/qt4/examples/draganddrop/puzzle/puzzle.debug +usr/lib/qt4/examples/effects/blurpicker/blurpicker.debug +usr/lib/qt4/examples/effects/customshader/customshader.debug +usr/lib/qt4/examples/effects/fademessage/fademessage.debug +usr/lib/qt4/examples/effects/lighting/lighting.debug +usr/lib/qt4/examples/gestures/imageviewer/imageviewer.debug +usr/lib/qt4/examples/graphicsview/anchorlayout/anchorlayout_example.debug usr/lib/qt4/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.debug usr/lib/qt4/examples/graphicsview/collidingmice/collidingmice.debug usr/lib/qt4/examples/graphicsview/diagramscene/diagramscene.debug @@ -88,6 +101,11 @@ usr/lib/qt4/examples/mainwindows/mdi/mdi.debug usr/lib/qt4/examples/mainwindows/menus/menus.debug usr/lib/qt4/examples/mainwindows/recentfiles/recentfiles.debug usr/lib/qt4/examples/mainwindows/sdi/sdi.debug +usr/lib/qt4/examples/multimedia/audio/audiodevices/audiodevices.debug +usr/lib/qt4/examples/multimedia/audio/audioinput/audioinput.debug +usr/lib/qt4/examples/multimedia/audio/audiooutput/audiooutput.debug +usr/lib/qt4/examples/multitouch/fingerpaint/fingerpaint.debug +usr/lib/qt4/examples/multitouch/pinchzoom/pinchzoom.debug usr/lib/qt4/examples/network/blockingfortuneclient/blockingfortuneclient.debug usr/lib/qt4/examples/network/broadcastreceiver/broadcastreceiver.debug usr/lib/qt4/examples/network/broadcastsender/broadcastsender.debug @@ -152,15 +170,23 @@ usr/lib/qt4/examples/sql/querymodel/querymodel.debug usr/lib/qt4/examples/sql/relationaltablemodel/relationaltablemodel.debug usr/lib/qt4/examples/sql/sqlwidgetmapper/sqlwidgetmapper.debug usr/lib/qt4/examples/sql/tablemodel/tablemodel.debug +usr/lib/qt4/examples/statemachine/eventtransitions/eventtransitions.debug +usr/lib/qt4/examples/statemachine/factorial/factorial.debug +usr/lib/qt4/examples/statemachine/pingpong/pingpong.debug +usr/lib/qt4/examples/statemachine/rogue/rogue.debug +usr/lib/qt4/examples/statemachine/trafficlight/trafficlight.debug +usr/lib/qt4/examples/statemachine/twowaybutton/twowaybutton.debug usr/lib/qt4/examples/threads/mandelbrot/mandelbrot.debug usr/lib/qt4/examples/threads/semaphores/semaphores.debug usr/lib/qt4/examples/threads/waitconditions/waitconditions.debug usr/lib/qt4/examples/tools/codecs/codecs.debug usr/lib/qt4/examples/tools/completer/completer.debug +usr/lib/qt4/examples/tools/contiguouscache/contiguouscache.debug usr/lib/qt4/examples/tools/customcompleter/customcompleter.debug usr/lib/qt4/examples/tools/echoplugin/echoplugin.debug usr/lib/qt4/examples/tools/echoplugin/plugin/libechoplugin.so.debug usr/lib/qt4/examples/tools/i18n/i18n.debug +usr/lib/qt4/examples/tools/inputpanel/inputpanel.debug usr/lib/qt4/examples/tools/plugandpaint/plugandpaint.debug usr/lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so.debug usr/lib/qt4/examples/tools/regexp/regexp.debug @@ -178,8 +204,9 @@ usr/lib/qt4/examples/tutorials/addressbook/part6/part6.debug usr/lib/qt4/examples/tutorials/addressbook/part7/part7.debug usr/lib/qt4/examples/uitools/multipleinheritance/multipleinheritance.debug usr/lib/qt4/examples/uitools/textfinder/textfinder.debug +usr/lib/qt4/examples/video/videographicsitem/videographicsitem.debug usr/lib/qt4/examples/webkit/fancybrowser/fancybrowser.debug -usr/lib/qt4/examples/webkit/formextractor/formextractor.debug +usr/lib/qt4/examples/webkit/formextractor/formExtractor.debug usr/lib/qt4/examples/webkit/googlechat/googlechat.debug usr/lib/qt4/examples/webkit/previewer/previewer.debug usr/lib/qt4/examples/widgets/analogclock/analogclock.debug @@ -206,6 +233,7 @@ usr/lib/qt4/examples/widgets/validators/validators.debug usr/lib/qt4/examples/widgets/wiggly/wiggly.debug usr/lib/qt4/examples/widgets/windowflags/windowflags.debug usr/lib/qt4/examples/xml/dombookmarks/dombookmarks.debug +usr/lib/qt4/examples/xml/htmlinfo/htmlinfo.debug usr/lib/qt4/examples/xml/rsslisting/rsslisting.debug usr/lib/qt4/examples/xml/saxbookmarks/saxbookmarks.debug usr/lib/qt4/examples/xml/streambookmarks/streambookmarks.debug @@ -213,6 +241,7 @@ usr/lib/qt4/examples/xml/xmlstreamlint/xmlstreamlint.debug usr/lib/qt4/examples/xmlpatterns/filetree/filetree.debug usr/lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.debug usr/lib/qt4/examples/xmlpatterns/recipes/recipes.debug +usr/lib/qt4/examples/xmlpatterns/schema/schema.debug usr/lib/qt4/examples/xmlpatterns/trafficinfo/trafficinfo.debug usr/lib/qt4/plugins/designer/libarthurplugin.so.debug usr/lib/qt4/plugins/designer/libcontainerextension.so.debug diff --git a/debian/qt4-demos-dbg.lintian b/debian/qt4-demos-dbg.lintian index ff074e7..93b3d3b 100644 --- a/debian/qt4-demos-dbg.lintian +++ b/debian/qt4-demos-dbg.lintian @@ -26,12 +26,19 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/embeddeddialogs/embe qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/gradients/gradients.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/interview/interview.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/mainwindow/mainwindow.debug -qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/mediaplayer/mediaplayer.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/mediaplayer/qmediaplayer.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/pathstroke/pathstroke.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/spreadsheet/spreadsheet.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/sqlbrowser/sqlbrowser.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/sub-attaq/sub-attaq.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/textedit/textedit.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/demos/undo/undo.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/animation/animatedtiles/animatedtiles.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/animation/appchooser/appchooser.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/animation/easing/easing.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/animation/moveblocks/moveblocks.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/animation/states/states.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/animation/stickman/stickman.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/dbus/chat/dbus-chat.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/dbus/complexpingpong/complexping.debug @@ -60,6 +67,12 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/draganddrop/dragg qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/draganddrop/dropsite/dropsite.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/draganddrop/puzzle/puzzle.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/effects/blurpicker/blurpicker.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/effects/customshader/customshader.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/effects/fademessage/fademessage.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/effects/lighting/lighting.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/gestures/imageviewer/imageviewer.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/graphicsview/anchorlayout/anchorlayout_example.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/graphicsview/collidingmice/collidingmice.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/graphicsview/diagramscene/diagramscene.debug @@ -104,6 +117,11 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/mainwindows/mdi/m qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/mainwindows/menus/menus.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/mainwindows/recentfiles/recentfiles.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/mainwindows/sdi/sdi.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/multimedia/audio/audiodevices/audiodevices.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/multimedia/audio/audioinput/audioinput.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/multimedia/audio/audiooutput/audiooutput.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/multitouch/fingerpaint/fingerpaint.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/multitouch/pinchzoom/pinchzoom.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/network/blockingfortuneclient/blockingfortuneclient.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/network/broadcastreceiver/broadcastreceiver.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/network/broadcastsender/broadcastsender.debug @@ -168,14 +186,22 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/sql/querymodel/qu qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/sql/relationaltablemodel/relationaltablemodel.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/sql/sqlwidgetmapper/sqlwidgetmapper.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/sql/tablemodel/tablemodel.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/statemachine/eventtransitions/eventtransitions.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/statemachine/factorial/factorial.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/statemachine/pingpong/pingpong.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/statemachine/rogue/rogue.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/statemachine/trafficlight/trafficlight.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/statemachine/twowaybutton/twowaybutton.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/threads/mandelbrot/mandelbrot.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/threads/semaphores/semaphores.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/threads/waitconditions/waitconditions.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/codecs/codecs.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/completer/completer.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/contiguouscache/contiguouscache.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/customcompleter/customcompleter.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/echoplugin/echoplugin.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/i18n/i18n.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/inputpanel/inputpanel.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/plugandpaint/plugandpaint.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/regexp/regexp.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tools/settingseditor/settingseditor.debug @@ -191,8 +217,9 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tutorials/address qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tutorials/addressbook/part7/part7.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/uitools/multipleinheritance/multipleinheritance.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/uitools/textfinder/textfinder.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/video/videographicsitem/videographicsitem.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/fancybrowser/fancybrowser.debug -qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/formextractor/formextractor.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/formextractor/formExtractor.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/googlechat/googlechat.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/previewer/previewer.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/widgets/analogclock/analogclock.debug @@ -219,6 +246,7 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/widgets/validator qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/widgets/wiggly/wiggly.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/widgets/windowflags/windowflags.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xml/dombookmarks/dombookmarks.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xml/htmlinfo/htmlinfo.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xml/rsslisting/rsslisting.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xml/saxbookmarks/saxbookmarks.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xml/streambookmarks/streambookmarks.debug @@ -226,4 +254,5 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xml/xmlstreamlint qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xmlpatterns/filetree/filetree.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xmlpatterns/recipes/recipes.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xmlpatterns/schema/schema.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/xmlpatterns/trafficinfo/trafficinfo.debug diff --git a/debian/qt4-demos.lintian b/debian/qt4-demos.lintian index 47a5601..60dadda 100644 --- a/debian/qt4-demos.lintian +++ b/debian/qt4-demos.lintian @@ -81,6 +81,36 @@ qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/title_cap_left. qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/title_cap_right.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/title_stretch.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/spreadsheet/images/interview.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/background.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/boat.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/bomb.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/boat/step1.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/boat/step2.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/boat/step3.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/boat/step4.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/submarine/step1.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/submarine/step2.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/submarine/step3.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/explosion/submarine/step4.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/submarine.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/surface.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/big/torpedo.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/small/background.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/small/boat.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/small/bomb.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/small/submarine.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/small/surface.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/small/torpedo.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-a.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-a2.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-b.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-dash.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-excl.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-q.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-s.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-t.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-t2.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/sub-attaq/pics/welcome/logo-u.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/logo32.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editcopy.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editcut.png @@ -136,6 +166,14 @@ qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/redo.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/remove.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/triangle.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/undo.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/Time-For-Lunch-2.jpg +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/centered.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/ellipse.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/figure8.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/kinetic.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/random.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/animatedtiles/images/tile.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/animation/easing/images/qt-logo.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/browse.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/filedialog.png @@ -383,6 +421,7 @@ qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/new qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/open.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/paste.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/save.png +qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/multitouch/pinchzoom/images/cheese.jpg qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/cdtoparent.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/dir.png qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/file.png diff --git a/debian/qt4-designer.install b/debian/qt4-designer.install index cc9edde..e89cbc9 100644 --- a/debian/qt4-designer.install +++ b/debian/qt4-designer.install @@ -3,6 +3,7 @@ usr/share/qt4/translations/designer_de.qm usr/share/qt4/translations/designer_ja.qm usr/share/qt4/translations/designer_pl.qm usr/share/qt4/translations/designer_ru.qm +usr/share/qt4/translations/designer_sl.qm usr/share/qt4/translations/designer_untranslated.qm usr/share/qt4/translations/designer_zh_CN.qm usr/share/qt4/translations/designer_zh_TW.qm diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install index a331c48..6b5590a 100644 --- a/debian/qt4-dev-tools.install +++ b/debian/qt4-dev-tools.install @@ -8,7 +8,9 @@ usr/bin/qdbusviewer usr/bin/qdoc3 usr/bin/qhelpconverter usr/bin/qhelpgenerator +usr/bin/qttracereplay usr/bin/xmlpatterns +usr/bin/xmlpatternsvalidator usr/share/qt4/phrasebooks/* usr/share/qt4/translations/assistant_adp_de.qm usr/share/qt4/translations/assistant_adp_ja.qm diff --git a/debian/rules b/debian/rules index 94b858d..1e7cc77 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +export DH_VERBOSE=1 export QTDIR := $(shell pwd) export PATH := $(QTDIR)/bin:$(PATH) @@ -44,7 +44,7 @@ DEB_DH_STRIP_ARGS_qt4-demos-dbg := --exclude=.debug DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug # Disable for rc -DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION) +#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION) DEB_INSTALL_DOCS_ALL := LGPL_EXCEPTION.txt |