...
 
Commits (12)
[qt]
4.8\libraryPath=/usr/lib/kde4/plugins
This source diff could not be displayed because it is too large. You can view the blob instead.
Source: qt4-x11
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>,
Modestas Vainius <modax@debian.org>,
Sune Vuorela <debian@pusling.com>,
......@@ -10,7 +11,6 @@ Uploaders: Fathi Boudra <fabo@debian.org>,
Timo Jyrinki <timo@debian.org>
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
flex,
freetds-dev,
libasound2-dev [linux-any],
......@@ -18,9 +18,10 @@ Build-Depends: debhelper (>= 9),
libcups2-dev,
libdbus-1-dev,
libfreetype6-dev,
libgl1-mesa-dev,
libgl1-mesa-dev [!armel !armhf],
libgles2-mesa-dev [armel armhf],
libglib2.0-dev,
libglu1-mesa-dev,
libglu1-mesa-dev [!armel !armhf],
libgtk2.0-dev,
libice-dev,
libicu-dev,
......@@ -32,7 +33,6 @@ Build-Depends: debhelper (>= 9),
libpq-dev,
libreadline-dev,
libsm-dev,
libsqlite0-dev,
libsqlite3-dev,
libssl-dev,
libtiff-dev,
......@@ -190,7 +190,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite | libqt4-sql-sqlite2 | libqt4-sql-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
Recommends: libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite
Suggests: libqt4-dev
Description: Qt 4 SQL module
Qt is a cross-platform C++ application framework. Qt's primary feature
......@@ -202,18 +202,6 @@ Description: Qt 4 SQL module
If you wish to use the SQL module for development, you should install the
libqt4-dev package.
Package: libqt4-sql-ibase
Architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libqt4-dev
Description: Qt 4 InterBase/FireBird database driver
This package contains the InterBase/FireBird plugin for Qt 4.
.
Install it if you intend to use or write Qt programs that are to access an
InterBase/FireBird DB.
Package: libqt4-sql-mysql
Architecture: any
Multi-Arch: same
......@@ -262,18 +250,6 @@ Description: Qt 4 SQLite 3 database driver
Install it if you intend to use or write Qt programs that are to access an
SQLite 3 DB.
Package: libqt4-sql-sqlite2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libqt4-dev
Description: Qt 4 SQLite 2 database driver
This package contains the SQLite 2 plugin for Qt 4.
.
Install it if you intend to use or write Qt programs that are to access an
SQLite 2 DB.
Package: libqt4-sql-tds
Architecture: any
Multi-Arch: same
......@@ -353,9 +329,6 @@ Description: Qt 4 D-Bus module
Applications using the QtDBus module can provide services to other, remote
applications by exporting objects, as well as use services exported by those
applications by placing calls and accessing properties.
.
This package depends on qdbus and libqtdbus4 to break their circular dependency
and allow easy updates from Squeeze to Wheezy.
Package: libqtdbus4
Architecture: any
......@@ -439,23 +412,6 @@ Description: Qt 4 test module
The QtTest module provides classes for unit testing Qt applications and
libraries.
Package: libqt4-phonon
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: libphonon4
Description: Qt 4 Phonon 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 Phonon module provides a cross-platform multimedia framework that
enables the use of audio and video content in Qt applications.
.
The sole purpose of this package to provide Phonon libraries until libphonon4
is built from the phonon source package. Therefore it's only useful when
bootstraping new architectures or rebuilding the whole archive from scratch.
Package: libqt4-declarative
Architecture: any
Multi-Arch: same
......@@ -587,8 +543,9 @@ Description: Qt 4 private development files
Package: libqt4-opengl-dev
Architecture: any
Section: libdevel
Depends: libgl1-mesa-dev | libgl-dev,
libglu1-mesa-dev,
Depends: libgl1-mesa-dev [!armel !armhf],
libgles2-mesa-dev [armel armhf],
libglu1-mesa-dev [!armel !armhf],
libqt4-dev (= ${binary:Version}),
libqt4-opengl (= ${binary:Version}),
${misc:Depends}
......
# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
# SymbolsHelper-Confirmed: 4:4.8.6+git64-g5dc8b2b+dfsg amd64
libQtDeclarative.so.4 libqt4-declarative #MINVER#
* Build-Depends-Package: libqt4-dev
_Z10qmlContextPK7QObject@Base 4:4.7.0~beta1
......@@ -82,6 +82,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZN16QDeclarativeItem16setKeepMouseGrabEb@Base 4:4.7.0~beta1
_ZN16QDeclarativeItem16staticMetaObjectE@Base 4:4.7.0~beta1
_ZN16QDeclarativeItem17componentCompleteEv@Base 4:4.7.0~beta1
_ZN16QDeclarativeItem17setAccessibleRoleEN11QAccessible4RoleE@Base 4:4.8.6+git64-g5dc8b2b+dfsg
(subst)_ZN16QDeclarativeItem17setBaselineOffsetE{qreal}@Base 4:4.7.0~beta1
(subst)_ZN16QDeclarativeItem17setImplicitHeightE{qreal}@Base 4:4.7.0~beta1
_ZN16QDeclarativeItem18activeFocusChangedEb@Base 4:4.7.0~rc1
......@@ -878,6 +879,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZN23QDeclarativeItemPrivate21implicitHeightChangedEv@Base 4:4.7.4
_ZN23QDeclarativeItemPrivate23setImplicitLayoutMirrorEbb@Base 4:4.7.4
_ZN23QDeclarativeItemPrivate24removeItemChangeListenerEP30QDeclarativeItemChangeListener6QFlagsINS_10ChangeTypeEE@Base 4:4.7.0~beta1
_ZN23QDeclarativeItemPrivate28setAccessibleFlagAndListenerEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN23QDeclarativeItemPrivate4dataEv@Base 4:4.7.0~beta2
_ZN23QDeclarativeItemPrivate5startER13QElapsedTimer@Base 4:4.7.0~beta2
_ZN23QDeclarativeItemPrivate6statesEv@Base 4:4.7.0~beta1
......@@ -1279,6 +1281,18 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZN29QDeclarativeDebugEnginesQueryD0Ev@Base 4:4.7.0~beta1
_ZN29QDeclarativeDebugEnginesQueryD1Ev@Base 4:4.7.0~beta1
_ZN29QDeclarativeDebugEnginesQueryD2Ev@Base 4:4.7.0~beta1
_ZN30QDeclarativeAccessibleAttached11nameChangedEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttached11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttached11qt_metacastEPKc@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttached11roleChangedEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttached16staticMetaObjectE@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttached18descriptionChangedEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttached21qmlAttachedPropertiesEP7QObject@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttachedC1EP7QObject@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttachedC2EP7QObject@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttachedD0Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttachedD1Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeAccessibleAttachedD2Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN30QDeclarativeDebugFileReference13setLineNumberEi@Base 4:4.7.0~beta1
_ZN30QDeclarativeDebugFileReference15setColumnNumberEi@Base 4:4.7.0~beta1
_ZN30QDeclarativeDebugFileReference6setUrlERK4QUrl@Base 4:4.7.0~beta1
......@@ -1423,6 +1437,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZNK16QDeclarativeItem12boundingRectEv@Base 4:4.7.0~beta1
_ZNK16QDeclarativeItem13implicitWidthEv@Base 4:4.7.0~beta1
_ZNK16QDeclarativeItem13keepMouseGrabEv@Base 4:4.7.0~beta1
_ZNK16QDeclarativeItem14accessibleRoleEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZNK16QDeclarativeItem14baselineOffsetEv@Base 4:4.7.0~beta1
_ZNK16QDeclarativeItem14hasActiveFocusEv@Base 4:4.7.0~rc1
_ZNK16QDeclarativeItem14implicitHeightEv@Base 4:4.7.0~beta1
......@@ -1493,6 +1508,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZNK16QDeclarativeView10rootObjectEv@Base 4:4.7.0~beta1
_ZNK16QDeclarativeView11initialSizeEv@Base 4:4.7.0~beta2
_ZNK16QDeclarativeView11rootContextEv@Base 4:4.7.0~rc1
_ZNK16QDeclarativeView18accessibleRootItemEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZNK16QDeclarativeView6engineEv@Base 4:4.7.0~rc1
_ZNK16QDeclarativeView6errorsEv@Base 4:4.7.0~beta1
_ZNK16QDeclarativeView6sourceEv@Base 4:4.7.0~beta1
......@@ -1897,6 +1913,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZNK29QDeclarativeAbstractAnimation9isRunningEv@Base 4:4.7.1
_ZNK29QDeclarativeDebugEnginesQuery10metaObjectEv@Base 4:4.7.0~beta1
_ZNK29QDeclarativeDebugEnginesQuery7enginesEv@Base 4:4.7.0~beta1
_ZNK30QDeclarativeAccessibleAttached10metaObjectEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZNK30QDeclarativeDebugFileReference10lineNumberEv@Base 4:4.7.0~beta1
_ZNK30QDeclarativeDebugFileReference12columnNumberEv@Base 4:4.7.0~beta1
_ZNK30QDeclarativeDebugFileReference3urlEv@Base 4:4.7.0~beta1
......@@ -2009,6 +2026,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZTI28QDeclarativeInspectorService@Base 4:4.8.0
_ZTI29QDeclarativeAbstractAnimation@Base 4:4.7.1
_ZTI29QDeclarativeDebugEnginesQuery@Base 4:4.7.0~beta1
_ZTI30QDeclarativeAccessibleAttached@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTI30QDeclarativeDebugPropertyWatch@Base 4:4.7.0~beta1
_ZTI30QDeclarativeExtensionInterface@Base 4:4.7.0~beta1
_ZTI30QDeclarativeOpenMetaObjectType@Base 4:4.7.0~beta1
......@@ -2078,6 +2096,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZTS28QDeclarativeInspectorService@Base 4:4.8.0
_ZTS29QDeclarativeAbstractAnimation@Base 4:4.7.1
_ZTS29QDeclarativeDebugEnginesQuery@Base 4:4.7.0~beta1
_ZTS30QDeclarativeAccessibleAttached@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTS30QDeclarativeDebugPropertyWatch@Base 4:4.7.0~beta1
_ZTS30QDeclarativeExtensionInterface@Base 4:4.7.0~beta1
_ZTS30QDeclarativeOpenMetaObjectType@Base 4:4.7.0~beta1
......@@ -2145,6 +2164,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
_ZTV28QDeclarativeInspectorService@Base 4:4.8.0
_ZTV29QDeclarativeAbstractAnimation@Base 4:4.7.1
_ZTV29QDeclarativeDebugEnginesQuery@Base 4:4.7.0~beta1
_ZTV30QDeclarativeAccessibleAttached@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTV30QDeclarativeDebugPropertyWatch@Base 4:4.7.0~beta1
_ZTV30QDeclarativeExtensionInterface@Base 4:4.7.0~beta1
_ZTV30QDeclarativeOpenMetaObjectType@Base 4:4.7.0~beta1
......
......@@ -5,3 +5,4 @@ usr/lib/*/qt4/plugins/codecs/*.so
usr/lib/*/qtchooser/4.conf
usr/lib/*/qtchooser/qt4.conf
usr/share/qtchooser/qt4-*.conf
debian/Trolltech.conf etc/xdg/
# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
# SymbolsHelper-Confirmed: 4:4.8.6+git64-g5dc8b2b+dfsg amd64
libQtGui.so.4 libqtgui4 #MINVER#
* Build-Depends-Package: libqt4-dev
_Z10qDrawArrowP8QPainterN2Qt9ArrowTypeENS1_8GUIStyleEbiiiiRK8QPaletteb@Base 4:4.5.3
......@@ -3483,6 +3483,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZN14QWidgetPrivate18_q_showIfNotHiddenEv@Base 4:4.5.3
_ZN14QWidgetPrivate18setConstraints_sysEv@Base 4:4.5.3
_ZN14QWidgetPrivate18setWindowTitle_sysERK7QString@Base 4:4.5.3
_ZN14QWidgetPrivate19registerTouchWindowEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN14QWidgetPrivate19setNetWmWindowTypesEv@Base 4:4.5.3
_ZN14QWidgetPrivate19updateIsTranslucentEv@Base 4:4.5.3
_ZN14QWidgetPrivate20reparentFocusWidgetsEP7QWidget@Base 4:4.5.3
......@@ -5043,6 +5044,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZN19QApplicationPrivate21cleanupMultitouch_sysEv@Base 4:4.6.1
_ZN19QApplicationPrivate21createEventDispatcherEv@Base 4:4.5.3
_ZN19QApplicationPrivate21obey_desktop_settingsE@Base 4:4.5.3
_ZN19QApplicationPrivate21x11GetTouchDeviceInfoEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN19QApplicationPrivate22quitOnLastWindowClosedE@Base 4:4.5.3
_ZN19QApplicationPrivate22reset_instance_pointerEv@Base 4:4.5.3
_ZN19QApplicationPrivate22translateRawTouchEventEP7QWidgetN11QTouchEvent10DeviceTypeERK5QListINS2_10TouchPointEE@Base 4:4.6.1
......@@ -6030,6 +6032,9 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZN24QAbstractPageSetupDialogD0Ev@Base 4:4.5.3
_ZN24QAbstractPageSetupDialogD1Ev@Base 4:4.5.3
_ZN24QAbstractPageSetupDialogD2Ev@Base 4:4.5.3
_ZN24QAccessibleTextInterface22textAtOffsetFromStringEiN12QAccessible212BoundaryTypeEPiS2_RK7QString@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN24QAccessibleTextInterface25textAfterOffsetFromStringEiN12QAccessible212BoundaryTypeEPiS2_RK7QString@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN24QAccessibleTextInterface26textBeforeOffsetFromStringEiN12QAccessible212BoundaryTypeEPiS2_RK7QString@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN24QGraphicsSceneHoverEvent10setLastPosERK7QPointF@Base 4:4.5.3
_ZN24QGraphicsSceneHoverEvent11setScenePosERK7QPointF@Base 4:4.5.3
_ZN24QGraphicsSceneHoverEvent12setModifiersE6QFlagsIN2Qt16KeyboardModifierEE@Base 4:4.5.3
......@@ -6194,6 +6199,12 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZN26QAbstractScrollAreaPrivateD0Ev@Base 4:4.7.4
_ZN26QAbstractScrollAreaPrivateD1Ev@Base 4:4.7.4
_ZN26QAbstractScrollAreaPrivateD2Ev@Base 4:4.7.4
_ZN26QAbstractSystemTrayIconSys13sendActivatedEN15QSystemTrayIcon16ActivationReasonE@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN26QAbstractSystemTrayIconSysC1EP15QSystemTrayIcon@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN26QAbstractSystemTrayIconSysC2EP15QSystemTrayIcon@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN26QAbstractSystemTrayIconSysD0Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN26QAbstractSystemTrayIconSysD1Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN26QAbstractSystemTrayIconSysD2Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN26QAbstractTransitionPrivateD0Ev@Base 4:4.7.4
_ZN26QAbstractTransitionPrivateD1Ev@Base 4:4.7.4
_ZN26QAbstractTransitionPrivateD2Ev@Base 4:4.7.4
......@@ -6283,6 +6294,12 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZN31QAbstractEventDispatcherPrivateD0Ev@Base 4:4.7.4
_ZN31QAbstractEventDispatcherPrivateD1Ev@Base 4:4.7.4
_ZN31QAbstractEventDispatcherPrivateD2Ev@Base 4:4.7.4
_ZN34QSystemTrayIconSysFactoryInterface11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN34QSystemTrayIconSysFactoryInterface11qt_metacastEPKc@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN34QSystemTrayIconSysFactoryInterface16availableChangedEb@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN34QSystemTrayIconSysFactoryInterface16staticMetaObjectE@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN34QSystemTrayIconSysFactoryInterfaceC1Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN34QSystemTrayIconSysFactoryInterfaceC2Ev@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZN38QAccessibleSimpleEditableTextInterface10deleteTextEii@Base 4:4.5.3
_ZN38QAccessibleSimpleEditableTextInterface10insertTextEiRK7QString@Base 4:4.5.3
_ZN38QAccessibleSimpleEditableTextInterface11replaceTextEiiRK7QString@Base 4:4.5.3
......@@ -11201,6 +11218,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZNK30QGraphicsSceneContextMenuEvent8scenePosEv@Base 4:4.5.3
_ZNK30QGraphicsSceneContextMenuEvent9modifiersEv@Base 4:4.5.3
_ZNK30QGraphicsSceneContextMenuEvent9screenPosEv@Base 4:4.5.3
_ZNK34QSystemTrayIconSysFactoryInterface10metaObjectEv@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZNK4QCss13StyleSelector14nodeNameEqualsENS0_7NodePtrERK7QString@Base 4:4.5.3
_ZNK4QCss13StyleSelector7nodeIdsENS0_7NodePtrE@Base 4:4.5.3
_ZNK4QCss5Value8toStringEv@Base 4:4.5.3
......@@ -12640,6 +12658,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZTI25QGraphicsSceneResizeEvent@Base 4:4.5.3
_ZTI26QAbstractGraphicsShapeItem@Base 4:4.5.3
_ZTI26QAbstractScrollAreaPrivate@Base 4:4.7.0~beta1
_ZTI26QAbstractSystemTrayIconSys@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTI27QAbstractTextDocumentLayout@Base 4:4.5.3
_ZTI27QAccessibleFactoryInterface@Base 4:4.5.3
_ZTI27QEventDispatcherGlibPrivate@Base 4:4.5.3
......@@ -12653,6 +12672,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZTI31QImageIOHandlerFactoryInterface@Base 4:4.5.3
_ZTI32QAccessibleEditableTextInterface@Base 4:4.5.3
_ZTI33QAccessibleBridgeFactoryInterface@Base 4:4.5.3
_ZTI34QSystemTrayIconSysFactoryInterface@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTI38QAccessibleSimpleEditableTextInterface@Base 4:4.5.3
_ZTI5QDial@Base 4:4.5.3
_ZTI5QDrag@Base 4:4.5.3
......@@ -12974,6 +12994,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZTS25QGraphicsSceneResizeEvent@Base 4:4.5.3
_ZTS26QAbstractGraphicsShapeItem@Base 4:4.5.3
_ZTS26QAbstractScrollAreaPrivate@Base 4:4.7.0~beta1
_ZTS26QAbstractSystemTrayIconSys@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTS27QAbstractTextDocumentLayout@Base 4:4.5.3
_ZTS27QAccessibleFactoryInterface@Base 4:4.5.3
_ZTS27QEventDispatcherGlibPrivate@Base 4:4.5.3
......@@ -12987,6 +13008,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZTS31QImageIOHandlerFactoryInterface@Base 4:4.5.3
_ZTS32QAccessibleEditableTextInterface@Base 4:4.5.3
_ZTS33QAccessibleBridgeFactoryInterface@Base 4:4.5.3
_ZTS34QSystemTrayIconSysFactoryInterface@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTS38QAccessibleSimpleEditableTextInterface@Base 4:4.5.3
_ZTS5QDial@Base 4:4.5.3
_ZTS5QDrag@Base 4:4.5.3
......@@ -13305,6 +13327,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZTV25QGraphicsSceneResizeEvent@Base 4:4.5.3
_ZTV26QAbstractGraphicsShapeItem@Base 4:4.5.3
_ZTV26QAbstractScrollAreaPrivate@Base 4:4.7.0~beta1
_ZTV26QAbstractSystemTrayIconSys@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTV27QAbstractTextDocumentLayout@Base 4:4.5.3
_ZTV27QAccessibleFactoryInterface@Base 4:4.5.3
_ZTV27QEventDispatcherGlibPrivate@Base 4:4.5.3
......@@ -13318,6 +13341,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
_ZTV31QImageIOHandlerFactoryInterface@Base 4:4.5.3
_ZTV32QAccessibleEditableTextInterface@Base 4:4.5.3
_ZTV33QAccessibleBridgeFactoryInterface@Base 4:4.5.3
_ZTV34QSystemTrayIconSysFactoryInterface@Base 4:4.8.6+git64-g5dc8b2b+dfsg
_ZTV38QAccessibleSimpleEditableTextInterface@Base 4:4.5.3
_ZTV5QDial@Base 4:4.5.3
_ZTV5QDrag@Base 4:4.5.3
......
Backport of:
From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001
From: Richard J. Moore <rich@kde.org>
Date: Sat, 21 Feb 2015 17:43:21 +0000
Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
This fixes a division by 0 when processing a maliciously crafted BMP
file. No impact beyond DoS.
Task-number: QTBUG-44547
Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
src/gui/image/qbmphandler.cpp | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
Index: qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/gui/image/qbmphandler.cpp
===================================================================
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg.orig/src/gui/image/qbmphandler.cpp 2015-05-25 13:33:13.362312974 -0400
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/gui/image/qbmphandler.cpp 2015-05-25 13:34:14.742873933 -0400
@@ -319,10 +319,16 @@
}
} else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
red_shift = calc_shift(red_mask);
+ if (((red_mask >> red_shift) + 1) == 0)
+ return false;
red_scale = 256 / ((red_mask >> red_shift) + 1);
green_shift = calc_shift(green_mask);
+ if (((green_mask >> green_shift) + 1) == 0)
+ return false;
green_scale = 256 / ((green_mask >> green_shift) + 1);
blue_shift = calc_shift(blue_mask);
+ if (((blue_mask >> blue_shift) + 1) == 0)
+ return false;
blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
} else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
blue_mask = 0x000000ff;
From 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Date: Wed, 11 Mar 2015 13:34:01 +0100
Subject: [PATCH] Fixes crash in bmp and ico image decoding
Fuzzing test revealed that for certain malformed bmp and ico files,
the handler would segfault.
Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
src/gui/image/qbmphandler.cpp | 13 +++++++------
src/plugins/imageformats/ico/qicohandler.cpp | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
Index: qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/gui/image/qbmphandler.cpp
===================================================================
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg.orig/src/gui/image/qbmphandler.cpp 2015-05-25 13:34:52.883223566 -0400
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/gui/image/qbmphandler.cpp 2015-05-25 13:34:52.879223529 -0400
@@ -478,12 +478,6 @@
p = data + (h-y-1)*bpl;
break;
case 2: // delta (jump)
- // Protection
- if ((uint)x >= (uint)w)
- x = w-1;
- if ((uint)y >= (uint)h)
- y = h-1;
-
{
quint8 tmp;
d->getChar((char *)&tmp);
@@ -491,6 +485,13 @@
d->getChar((char *)&tmp);
y += tmp;
}
+
+ // Protection
+ if ((uint)x >= (uint)w)
+ x = w-1;
+ if ((uint)y >= (uint)h)
+ y = h-1;
+
p = data + (h-y-1)*bpl + x;
break;
default: // absolute mode
Index: qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/plugins/imageformats/ico/qicohandler.cpp
===================================================================
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg.orig/src/plugins/imageformats/ico/qicohandler.cpp 2015-05-25 13:34:52.883223566 -0400
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/plugins/imageformats/ico/qicohandler.cpp 2015-05-25 13:34:52.879223529 -0400
@@ -571,7 +571,7 @@
QImage::Format format = QImage::Format_ARGB32;
if (icoAttrib.nbits == 24)
format = QImage::Format_RGB32;
- else if (icoAttrib.ncolors == 2)
+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
format = QImage::Format_Mono;
else if (icoAttrib.ncolors > 0)
format = QImage::Format_Indexed8;
From d3048a29797ee2d80d84bbda26bb3c954584f332 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Date: Wed, 11 Mar 2015 09:00:41 +0100
Subject: [PATCH] Fixes crash in gif image decoder
Fuzzing test revealed that for certain malformed gif files,
qgifhandler would segfault.
Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
Reviewed-by: Richard J. Moore <rich@kde.org>
---
src/gui/image/qgifhandler.cpp | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Index: qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/gui/image/qgifhandler.cpp
===================================================================
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg.orig/src/gui/image/qgifhandler.cpp 2015-05-25 13:35:02.255309602 -0400
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/src/gui/image/qgifhandler.cpp 2015-05-25 13:35:02.251309565 -0400
@@ -951,6 +951,8 @@
void QGIFFormat::nextY(unsigned char *bits, int bpl)
{
+ if (out_of_bounds)
+ return;
int my;
switch (interlace) {
case 0: // Non-interlaced
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -7801,7 +7801,7 @@ case "$XPLATFORM" in
# Check gcc's version
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 4*)
+ 5*|4*)
;;
3.4*)
canBuildQtXmlPatterns="no"
@@ -8124,6 +8124,10 @@ g++*)
QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'`
QT_GCC_PATCH_VERSION=0
;;
+ *)
+ QT_GCC_MAJOR_VERSION=$COMPILER_VERSION
+ QT_GCC_MINOR_VERSION=0
+ QT_GCC_PATCH_VERSION=0
esac
case "$COMPILER_VERSION" in
@@ -8133,7 +8137,7 @@ g++*)
3.*)
COMPILER_VERSION="3.*"
;;
- 4.*)
+ 5.*|4.*)
COMPILER_VERSION="4"
;;
*)
Description: change default input method from xim to ibus for kubuntu
Probably neeeds a more invasive change to go upstream.
Author: Jonathan Riddell <jriddell@ubuntu.com>
Forwarded: no
Last-Update: 2009-12-23
---
src/gui/kernel/qapplication_x11.cpp | 2 +-
src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp | 2 +-
tools/qtconfig/mainwindow.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1089,7 +1089,7 @@
X11->default_im = QLatin1String("imsw-multi");
} else {
X11->default_im = settings.value(QLatin1String("DefaultInputMethod"),
- QLatin1String("xim")).toString();
+ QLatin1String("ibus")).toString();
}
#endif //QT_NO_IM
settings.endGroup(); // Qt
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -79,7 +79,7 @@
if (def.isEmpty()) {
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
settings.beginGroup(QLatin1String("Qt"));
- def = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("xim")).toString();
+ def = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("ibus")).toString();
}
current = keys.indexOf(def);
if (current < 0)
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -397,7 +397,7 @@
#if defined(Q_WS_X11) && !defined(QT_NO_XIM)
QStringList inputMethodCombo = QInputContextFactory::keys();
int inputMethodComboIndex = -1;
- QString defaultInputMethod = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("xim")).toString();
+ QString defaultInputMethod = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("ibus")).toString();
for (int i = inputMethodCombo.size()-1; i >= 0; --i) {
const QString &im = inputMethodCombo.at(i);
if (im.contains(QLatin1String("imsw"))) {
Description: There should be no reason to disable stack protector unless one
is building with an ancient version of GCC.
Author: Kees Cook <kees@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/538237
Forwarded: no
---
src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 8 --------
1 file changed, 8 deletions(-)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
@@ -58,14 +58,6 @@ contains(JAVASCRIPTCORE_JIT,no) {
DEFINES+=ENABLE_YARR=0
}
-# Rules when JIT enabled (not disabled)
-!contains(DEFINES, ENABLE_JIT=0) {
- linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
- QMAKE_CXXFLAGS += -fno-stack-protector
- QMAKE_CFLAGS += -fno-stack-protector
- }
-}
-
wince* {
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c
This diff is collapsed.
This diff is collapsed.
Description Change I469e3d39: use a translucent drag pixmap if compositing is active
due to be accepted after Qt 5 d'n'd is fixed(!)
Author: Ignat Semenov
Forwarded: http://codereview.qt-project.org/#change,16809
---
src/gui/kernel/qdnd_x11.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
Index: qt-everywhere-opensource-src-4.8.4/src/gui/kernel/qdnd_x11.cpp
===================================================================
--- qt-everywhere-opensource-src-4.8.4.orig/src/gui/kernel/qdnd_x11.cpp 2013-01-09 12:39:43.617142864 +0000
+++ qt-everywhere-opensource-src-4.8.4/src/gui/kernel/qdnd_x11.cpp 2013-01-09 12:39:43.609142864 +0000
@@ -290,11 +290,15 @@
void setPixmap(const QPixmap &pm)
{
- QBitmap mask = pm.mask();
- if (!mask.isNull()) {
- setMask(mask);
- } else {
+ if (QX11Info::isCompositingManagerRunning()) {
+ setAttribute(Qt::WA_TranslucentBackground);
clearMask();
+ } else {
+ QBitmap mask = pm.mask();
+ if (!mask.isNull())
+ setMask(mask);
+ else
+ clearMask();
}
resize(pm.width(),pm.height());
pixmap = pm;
Description: use CUPS settings in print dialog
Bug: https://bugreports.qt-project.org/browse/QTBUG-25372
Bug-KDE: https://bugs.kde.org/180051
Bug-Ubuntu: https://launchpad.net/bugs/905147
Forwarded: no
Index: precise-updates-qt4-x11/src/gui/dialogs/qprintdialog_unix.cpp
===================================================================
--- precise-updates-qt4-x11.orig/src/gui/dialogs/qprintdialog_unix.cpp 2012-07-25 17:06:19.586211000 +0200
+++ precise-updates-qt4-x11/src/gui/dialogs/qprintdialog_unix.cpp 2012-07-25 17:18:27.612092214 +0200
@@ -579,6 +579,32 @@
void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
{
options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
+
+ if (cups) {
+ const ppd_option_t* duplex = cups->ppdOption("Duplex");
+ if (duplex) {
+ // copy default ppd duplex to qt dialog
+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
+ options.duplexShort->setChecked(true);
+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
+ options.duplexLong->setChecked(true);
+ else
+ options.noDuplex->setChecked(true);
+ }
+
+ if (cups->currentPPD()) {
+ // set default color
+ if (cups->currentPPD()->color_device)
+ options.color->setChecked(true);
+ else
+ options.grayscale->setChecked(true);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups->ppdOption("Collate");
+ if (collate)
+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
+ }
}
#endif
Index: precise-updates-qt4-x11/src/gui/painting/qprinter.cpp
===================================================================
--- precise-updates-qt4-x11.orig/src/gui/painting/qprinter.cpp 2012-07-25 17:06:19.586211000 +0200
+++ precise-updates-qt4-x11/src/gui/painting/qprinter.cpp 2012-07-25 17:18:27.612092214 +0200
@@ -609,6 +609,44 @@
&& d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
setOutputFormat(QPrinter::PdfFormat);
}
+
+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+ // fill in defaults from ppd file
+ QCUPSSupport cups;
+
+ int printernum = -1;
+ for (int i = 0; i < cups.availablePrintersCount(); i++) {
+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
+ printernum = i;
+ }
+ if (printernum >= 0) {
+ cups.setCurrentPrinter(printernum);
+
+ const ppd_option_t* duplex = cups.ppdOption("Duplex");
+ if (duplex) {
+ // copy default ppd duplex to qt dialog
+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
+ setDuplex(DuplexShortSide);
+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
+ setDuplex(DuplexLongSide);
+ else
+ setDuplex(DuplexNone);
+ }
+
+ if (cups.currentPPD()) {
+ // set default color
+ if (cups.currentPPD()->color_device)
+ setColorMode(Color);
+ else
+ setColorMode(GrayScale);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups.ppdOption("Collate");
+ if (collate)
+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
+ }
+#endif
}
/*!
From: Ken VanDine <ken.vandine@canonical.com>
Description: Default to regular font in X11
Default to Regular/Normal instead of Medium in QFontDatabase for X11.
.
Tweak the buckets so that Medium has preference over Bold when DemiBold
is requested.
Bug-Ubuntu: https://launchpad.net/bugs/744812
Bug: https://bugreports.qt-project.org/browse/QTBUG-27301
Forwarded: https://codereview.qt-project.org/#change,35591
Author: Michał Sawicz<michal.sawicz@canonical.com>
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -729,10 +729,17 @@
static int getFCWeight(int fc_weight)
{
int qtweight = QFont::Black;
- if (fc_weight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_MEDIUM) / 2)
+ if (fc_weight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_REGULAR) / 2)
qtweight = QFont::Light;
- else if (fc_weight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2)
+ else if (fc_weight <= (FC_WEIGHT_REGULAR + FC_WEIGHT_MEDIUM) / 2)
qtweight = QFont::Normal;
+#if 0
+ // FIXME: Uncomment this when it's safe to expand the Enum to include ::Medium
+ // Will map Medium to DemiBold via fallthrough for the moment,
+ // but avoids API/ABI break
+ else if (fc_weight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2)
+ qtweight = QFont::Medium;
+#endif
else if (fc_weight <= (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD) / 2)
qtweight = QFont::DemiBold;
else if (fc_weight <= (FC_WEIGHT_BOLD + FC_WEIGHT_BLACK) / 2)
@@ -772,9 +779,13 @@
fontDef.styleHint
*/
+ // Default to Regular and thus to the common case. Previous
+ // versions of Qt requested Medium as default. This is fine until
+ // a Medium weight is actually provided by a font, and so gets
+ // promoted to bold fallthrough.
int weight;
if (FcPatternGetInteger(pattern, FC_WEIGHT, 0, &weight) != FcResultMatch)
- weight = FC_WEIGHT_MEDIUM;
+ weight = FC_WEIGHT_REGULAR;
fontDef.weight = getFCWeight(weight);
int slant;
@@ -1066,16 +1077,19 @@
// capitalize(value);
familyName = QString::fromUtf8((const char *)value);
slant_value = FC_SLANT_ROMAN;
- weight_value = FC_WEIGHT_MEDIUM;
+ weight_value = FC_WEIGHT_REGULAR;
spacing_value = FC_PROPORTIONAL;
file_value = 0;
index_value = 0;
scalable = FcTrue;
+ // Fallthroughs in case a match was not found. In previous
+ // versions of Qt, Medium was requested from FontConfig,
+ // leading to a promotion from Medium to Bold.
if (FcPatternGetInteger (fonts->fonts[i], FC_SLANT, 0, &slant_value) != FcResultMatch)
slant_value = FC_SLANT_ROMAN;
if (FcPatternGetInteger (fonts->fonts[i], FC_WEIGHT, 0, &weight_value) != FcResultMatch)
- weight_value = FC_WEIGHT_MEDIUM;
+ weight_value = FC_WEIGHT_REGULAR;
if (FcPatternGetInteger (fonts->fonts[i], FC_SPACING, 0, &spacing_value) != FcResultMatch)
spacing_value = FC_PROPORTIONAL;
if (FcPatternGetString (fonts->fonts[i], FC_FILE, 0, &file_value) != FcResultMatch)
@@ -1487,14 +1501,32 @@
}
int weight_value = FC_WEIGHT_BLACK;
+ // Default and request Regular font weight if none specified
+ // Previous versions of Qt default to requesting Medium, even
+ // though this weight does not typically exist.
if (request.weight == 0)
- weight_value = FC_WEIGHT_MEDIUM;
+ weight_value = FC_WEIGHT_REGULAR;
else if (request.weight < (QFont::Light + QFont::Normal) / 2)
weight_value = FC_WEIGHT_LIGHT;
- else if (request.weight < (QFont::Normal + QFont::DemiBold) / 2)
+#if 0
+ // FIXME: Avoid ABI Break; active this full codepath when
+ // QFont::Medium enum is available in the future
+ else if (request.weight < (QFont::Normal + QFont::Medium) / 2)
+ weight_value = FC_WEIGHT_REGULAR;
+ else if (request.weight < (QFont::Medium + QFont::DemiBold) / 2)
weight_value = FC_WEIGHT_MEDIUM;
else if (request.weight < (QFont::DemiBold + QFont::Bold) / 2)
weight_value = FC_WEIGHT_DEMIBOLD;
+#else
+ // For the moment This may still not full-circle correctly; via
+ // Medium->DemiBold->Bold promotion. However It's hard to do much
+ // about this without an ABI/API tweak to include the fuller set
+ // of standard TTF/CSS/FontConfig weights.
+ else if (request.weight < (QFont::Normal + QFont::DemiBold) / 2)
+ weight_value = FC_WEIGHT_REGULAR;
+ else if (request.weight < (QFont::DemiBold + QFont::Bold) / 2)
+ weight_value = (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2;
+#endif
else if (request.weight < (QFont::Bold + QFont::Black) / 2)
weight_value = FC_WEIGHT_BOLD;
FcPatternDel(pattern, FC_WEIGHT);
Description: armel is no longer supported in Ubuntu, disable neon
.
qt4-x11 (4:4.8.4+dfsg-0ubuntu2) raring; urgency=low
.
* Disable neon for Ubuntu since armel is no longer supported.
Author: Tim Gardner <tim.gardner@canonical.com>
--- /dev/null
+++ qt4-x11-4.8.4+dfsg/imports/junk
@@ -0,0 +1 @@
+1
--- /dev/null
+++ qt4-x11-4.8.4+dfsg/templates/junk
@@ -0,0 +1 @@
+1
Description: do not build QtMeegoGraphicsSystemHelper library
Author: Dmitry Shachnev <mitya57@ubuntu.com>
Forwarded: no
Last-Update: 2014-11-04
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -50,5 +50,3 @@
QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
!win32:!embedded:!mac:!symbian:CONFIG += x11
-
-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
--- a/src/plugins/graphicssystems/graphicssystems.pro
+++ b/src/plugins/graphicssystems/graphicssystems.pro
@@ -11,5 +11,3 @@
}
!win32:!embedded:!mac:!symbian:CONFIG += x11
-
-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += meego
From b3460f7aa01262374c014092b618407de5cb0390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <aurelien.gateau@canonical.com>
Date: Wed, 28 Sep 2011 16:19:18 +0200
Subject: [PATCH] Use ubuntu_gtk_disable_overlay_scrollbar() to get rid of
overlay scrollbars
Forwarded: no
This is more robust than using the LIBOVERLAY_SCROLLBAR environment variable
as some programs (vlc) do not let us set variables.
---
src/gui/styles/qgtkstyle_p.cpp | 4 ++++
src/gui/styles/qgtkstyle_p.h | 2 ++
2 files changed, 6 insertions(+)
--- a/src/gui/styles/qgtkstyle_p.cpp
+++ b/src/gui/styles/qgtkstyle_p.cpp
@@ -84,6 +84,7 @@
Ptr_gtk_container_forall QGtkStylePrivate::gtk_container_forall = 0;
Ptr_gtk_init QGtkStylePrivate::gtk_init = 0;
+Ptr_ubuntu_gtk_set_use_overlay_scrollbar QGtkStylePrivate::ubuntu_gtk_set_use_overlay_scrollbar = 0;
Ptr_gtk_style_attach QGtkStylePrivate::gtk_style_attach = 0;
Ptr_gtk_window_new QGtkStylePrivate::gtk_window_new = 0;
Ptr_gtk_widget_destroy QGtkStylePrivate::gtk_widget_destroy = 0;
@@ -316,6 +317,7 @@
libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics);
gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
+ ubuntu_gtk_set_use_overlay_scrollbar = (Ptr_ubuntu_gtk_set_use_overlay_scrollbar)libgtk.resolve("ubuntu_gtk_set_use_overlay_scrollbar");
gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
gtk_style_attach = (Ptr_gtk_style_attach)libgtk.resolve("gtk_style_attach");
gtk_widget_destroy = (Ptr_gtk_widget_destroy)libgtk.resolve("gtk_widget_destroy");
@@ -520,6 +522,8 @@
x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
QGtkStylePrivate::gtk_init (NULL, NULL);
XSetErrorHandler(qt_x_errhandler);
+ if (QGtkStylePrivate::ubuntu_gtk_set_use_overlay_scrollbar)
+ QGtkStylePrivate::ubuntu_gtk_set_use_overlay_scrollbar(false);
// make a window
GtkWidget* gtkWindow = QGtkStylePrivate::gtk_window_new(GTK_WINDOW_POPUP);
--- a/src/gui/styles/qgtkstyle_p.h
+++ b/src/gui/styles/qgtkstyle_p.h
@@ -137,6 +137,7 @@
typedef bool (*Ptr_gconf_client_get_bool)(GConfClient*, const char*, GError **);
typedef void (*Ptr_gtk_init)(int *, char ***);
+typedef void (*Ptr_ubuntu_gtk_set_use_overlay_scrollbar) (gboolean);
typedef GtkWidget* (*Ptr_gtk_window_new) (GtkWindowType);
typedef GtkStyle* (*Ptr_gtk_style_attach)(GtkStyle *, GdkWindow *);
typedef void (*Ptr_gtk_widget_destroy) (GtkWidget *);
@@ -358,6 +359,7 @@
static Ptr_gtk_container_forall gtk_container_forall;
static Ptr_gtk_init gtk_init;
+ static Ptr_ubuntu_gtk_set_use_overlay_scrollbar ubuntu_gtk_set_use_overlay_scrollbar;
static Ptr_gtk_style_attach gtk_style_attach;
static Ptr_gtk_window_new gtk_window_new;
static Ptr_gtk_widget_destroy gtk_widget_destroy;
Description: Fix XInput event valuator access.
Fix was proposed upstream at
https://qt.gitorious.org/qt/qt/merge_requests/1397 but Qt since moved to
gerrit. Needs re-forwarding.
Author: Jussi Pakkanen <jussi.pakkanen@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/799202
Forwarded: no
---
src/gui/kernel/qapplication_x11.cpp | 96 ++++++++++++++++++++++++++++++------
1 file changed, 82 insertions(+), 14 deletions(-)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -4809,6 +4809,20 @@
return false;
}
+/* XInput only reports those valuators whose values have changed.
+ * We have to preserve old values. This is a quick hack to test
+ * whether it works or not. It will most likely fail in several
+ * ways if, for example, there is more than one tablet event
+ * source or anything like that.
+ */
+
+static int previousXLoc = 0;
+static int previousYLoc = 0;
+static int previousXTilt = 0;
+static int previousYTilt = 0;
+static qreal previousPressure = 0;
+static qreal previousRotation = 0;
+
bool QETWidget::translateXinputEvent(const XEvent *ev, QTabletDeviceData *tablet)
{
#if defined (Q_OS_IRIX)
@@ -4827,12 +4841,14 @@
QPoint global,
curr;
QPointF hiRes;
- qreal pressure = 0;
- int xTilt = 0,
- yTilt = 0,
+ qreal pressure = previousPressure;
+ int xLoc = previousXLoc,
+ yLoc = previousYLoc,
+ xTilt = previousXTilt,
+ yTilt = previousYTilt,
z = 0;
qreal tangentialPressure = 0;
- qreal rotation = 0;
+ qreal rotation = previousRotation;
int deviceType = QTabletEvent::NoDevice;
int pointerType = QTabletEvent::UnknownPointer;
const XDeviceMotionEvent *motion = 0;
@@ -4976,22 +4992,64 @@
fetchWacomToolId(deviceType, uid);
QRect screenArea = qApp->desktop()->rect();
+ const unsigned char xIndex = 0;
+ const unsigned char yIndex = 1;
+ const unsigned char pressureIndex = 2;
+ const unsigned char xTiltIndex = 3;
+ const unsigned char yTiltIndex = 4;
+ const unsigned char rotationIndex = 5;
if (motion) {
- xTilt = (short) motion->axis_data[3];
- yTilt = (short) motion->axis_data[4];
- rotation = ((short) motion->axis_data[5]) / 64.0;
- pressure = (short) motion->axis_data[2];
+ const unsigned char firstAxis = motion->first_axis;
+ const unsigned char axesCount = motion->axes_count;
+ const unsigned char maxIndex = firstAxis + axesCount;
+
+ if (xIndex >= firstAxis && xIndex < maxIndex)
+ xLoc = motion->axis_data[xIndex - firstAxis];
+
+ if (yIndex >= firstAxis && yIndex < maxIndex)
+ yLoc = motion->axis_data[yIndex - firstAxis];
+
+ if (xTiltIndex >= firstAxis && xTiltIndex < maxIndex)
+ xTilt = (short) motion->axis_data[xTiltIndex - firstAxis];
+
+ if (yTiltIndex >= firstAxis && yTiltIndex < maxIndex)
+ yTilt = (short) motion->axis_data[yTiltIndex - firstAxis];
+
+ if (rotationIndex >= firstAxis && rotationIndex < maxIndex)
+ rotation = ((short) motion->axis_data[rotationIndex - firstAxis]) / 64.0;
+
+ if (pressureIndex >= firstAxis && pressureIndex < maxIndex)
+ pressure = (short) motion->axis_data[pressureIndex - firstAxis];
+
modifiers = X11->translateModifiers(motion->state);
- hiRes = tablet->scaleCoord(motion->axis_data[0], motion->axis_data[1],
+ hiRes = tablet->scaleCoord(xLoc, yLoc,
screenArea.x(), screenArea.width(),
screenArea.y(), screenArea.height());
} else if (button) {
- xTilt = (short) button->axis_data[3];
- yTilt = (short) button->axis_data[4];
- rotation = ((short) button->axis_data[5]) / 64.0;
- pressure = (short) button->axis_data[2];
+ const unsigned char firstAxis = button->first_axis;
+ const unsigned char axesCount = button->axes_count;
+ const unsigned char maxIndex = firstAxis + axesCount;
+
+ if (xIndex >= firstAxis && xIndex < maxIndex)
+ xLoc = button->axis_data[xIndex - firstAxis];
+
+ if (yIndex >= firstAxis && yIndex < maxIndex)
+ yLoc = button->axis_data[yIndex - firstAxis];
+
+ if (xTiltIndex >= firstAxis && xTiltIndex < maxIndex)
+ xTilt = (short) button->axis_data[xTiltIndex - firstAxis];
+
+ if (yTiltIndex >= firstAxis && yTiltIndex < maxIndex)
+ yTilt = (short) button->axis_data[yTiltIndex - firstAxis];
+
+ if (rotationIndex >= firstAxis && rotationIndex < maxIndex)
+ rotation = ((short) button->axis_data[rotationIndex - firstAxis]) / 64.0;
+
+ if (pressureIndex >= firstAxis && pressureIndex < maxIndex)
+ pressure = (short) button->axis_data[pressureIndex - firstAxis];
+
modifiers = X11->translateModifiers(button->state);
- hiRes = tablet->scaleCoord(button->axis_data[0], button->axis_data[1],
+ hiRes = tablet->scaleCoord(xLoc, yLoc,
screenArea.x(), screenArea.width(),
screenArea.y(), screenArea.height());
} else if (proximity) {
@@ -5025,6 +5083,16 @@
deviceType, pointerType,
qreal(pressure / qreal(tablet->maxPressure - tablet->minPressure)),
xTilt, yTilt, tangentialPressure, rotation, z, modifiers, uid);
+ /* Preserve current values because the X server will *not*
+ * re-send them if they do not change.
+ */
+ previousXLoc = xLoc;
+ previousYLoc = yLoc;
+ previousXTilt = xTilt;
+ previousYTilt = yTilt;
+ previousPressure = pressure;
+ previousRotation = rotation;
+
if (proximity) {
QApplication::sendSpontaneousEvent(qApp, &e);
} else {
Description: Manually remove panning gesture subscription from qabstractscrollarea.cpp.
Thus all scrolling happens via mouse wheel events synthesised by X.
Author: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/805972
Forwarded: no
=== modified file 'src/gui/widgets/qabstractscrollarea.cpp'
---
src/gui/widgets/qabstractscrollarea.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/src/gui/widgets/qabstractscrollarea.cpp
+++ b/src/gui/widgets/qabstractscrollarea.cpp
@@ -296,7 +296,7 @@ void QAbstractScrollAreaPrivate::init()
layoutChildren();
#ifndef Q_WS_MAC
#ifndef QT_NO_GESTURES
- viewport->grabGesture(Qt::PanGesture);
+ //viewport->grabGesture(Qt::PanGesture);
#endif
#endif
}
@@ -549,7 +549,7 @@ void QAbstractScrollArea::setViewport(QW
d->viewport->installEventFilter(d->viewportFilter.data());
#ifndef Q_WS_MAC
#ifndef QT_NO_GESTURES
- d->viewport->grabGesture(Qt::PanGesture);
+// d->viewport->grabGesture(Qt::PanGesture);
#endif
#endif
d->layoutChildren();
This diff is collapsed.
Index: qt4-x11-4.8.6-64-g5dc8b2b/src/declarative/qml/qdeclarativeengine.cpp
===================================================================
--- qt4-x11-4.8.6-64-g5dc8b2b.orig/src/declarative/qml/qdeclarativeengine.cpp
+++ qt4-x11-4.8.6-64-g5dc8b2b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2567,4 +2567,10 @@ bool QDeclarative_isFileCaseCorrect(cons
return true;
}
+QDeclarativeAccessibilityUpdater *QDeclarativeEnginePrivate::getAccessibilityUpdater(QDeclarativeEngine *e)
+{
+ static QDeclarativeAccessibilityUpdater accessibilityUpdater;
+ return &accessibilityUpdater;
+}
+
QT_END_NAMESPACE
Index: qt4-x11-4.8.6-64-g5dc8b2b/src/declarative/qml/qdeclarativeengine_p.h
===================================================================
--- qt4-x11-4.8.6-64-g5dc8b2b.orig/src/declarative/qml/qdeclarativeengine_p.h
+++ qt4-x11-4.8.6-64-g5dc8b2b/src/declarative/qml/qdeclarativeengine_p.h
@@ -238,8 +238,6 @@ public:
mutable QMutex mutex;
- QDeclarativeAccessibilityUpdater accessibilityUpdater;
-
QDeclarativeTypeLoader typeLoader;
QDeclarativeImportDatabase importDatabase;
@@ -314,7 +312,7 @@ public:
static QScriptValue formatTime(QScriptContext*, QScriptEngine*);
static QScriptValue formatDateTime(QScriptContext*, QScriptEngine*);
#endif
- static QDeclarativeAccessibilityUpdater *getAccessibilityUpdater(QDeclarativeEngine *e) { return &e->d_func()->accessibilityUpdater; }
+ static QDeclarativeAccessibilityUpdater *getAccessibilityUpdater(QDeclarativeEngine *e);
static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { if (!e) return 0; return &e->d_func()->scriptEngine; }
static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p->q_func(); }
static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); }
Description: Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
Implements QEventLoop::ExcludeSocketNotifiers in the same way
QEventLoop::X11ExcludeTimers is already implemented for the glib
event loop.
Fixes crash in Libreoffice with KDE theme
Forwarded: https://codereview.qt-project.org/#change,80528
Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-37380
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/1290514
Author: Jan-Marek Glogowski <glogow@fbihome.de>
Last-Update: 2014-03-11
Index: qt4-x11-4.8.5+git192-g085f851+dfsg/src/corelib/kernel/qeventdispatcher_glib.cpp
===================================================================
--- qt4-x11-4.8.5+git192-g085f851+dfsg.orig/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-03-11 13:28:12.330924177 +0000
+++ qt4-x11-4.8.5+git192-g085f851+dfsg/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-03-11 13:28:12.314924177 +0000
@@ -65,6 +65,7 @@
struct GSocketNotifierSource
{
GSource source;
+ QEventLoop::ProcessEventsFlags processEventsFlags;
QList<GPollFDWithQSocketNotifier *> pollfds;
};
@@ -80,6 +81,9 @@
GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
bool pending = false;
+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
+ return pending;
+
for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
@@ -103,6 +107,9 @@
QEvent event(QEvent::SockAct);
GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
+ return true;
+
for (int i = 0; i < src->pollfds.count(); ++i) {
GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
@@ -331,6 +338,7 @@
reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
sizeof(GSocketNotifierSource)));
(void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
+ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
g_source_set_can_recurse(&socketNotifierSource->source, true);
g_source_attach(&socketNotifierSource->source, mainContext);
@@ -416,6 +424,7 @@
// tell postEventSourcePrepare() and timerSource about any new flags
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
d->timerSource->processEventsFlags = flags;
+ d->socketNotifierSource->processEventsFlags = flags;
if (!(flags & QEventLoop::EventLoopExec)) {
// force timers to be sent at normal priority
@@ -427,6 +436,7 @@
result = g_main_context_iteration(d->mainContext, canWait);
d->timerSource->processEventsFlags = savedFlags;
+ d->socketNotifierSource->processEventsFlags = savedFlags;
if (canWait)
emit awake();
Description: Delays with QClipboard and "useEventLoop"
If LibreOffice is running with KDE integration and KFileDialog is
open, if clipboard contents are held by LO (i.e. Ctrl+C in LO before
the dialog is opened), then there is a visible delay when moving the
mouse over the dialog contents. This is because KFileDialog
repeatedly checks clipboard contents and these checks take visibly
long (and there's not so few of them).
.
LO/Qt integration needs to set QClipboard to "useEventLoop" mode. The
code there adds 50ms delay to every single clipboard data fetch,
presumably to avoid busy-looping, but it's quite long and often
needless.
.
The attached patch avoids any visible delay in the KFileDialog in this case.
Author: Luboš Luňák
Origin: other>, see bug
Bug: https://bugreports.qt-project.org/browse/QTBUG-38585
Forwarded: see bug
Applied-Upstream: not yet
Reviewed-by: Jonathan Riddell
Last-Update: 2014-11-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- qt/src/gui/kernel/qclipboard_x11.cpp.sav 2014-04-25 09:52:03.855693228 +0200
+++ qt/src/gui/kernel/qclipboard_x11.cpp 2014-04-25 09:51:58.038693777 +0200
@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Win
return false;
XSync(X11->display, false);
- usleep(50000);
+ if (!XPending(X11->display))
+ usleep(5000);
now.start();
Description: Repaint errors when run with X11 clipboard code branch
Fixes crash in LibreOffice with KDE integration
Author: Jan-Marek Glogowski
Origin: see bug
Bug: https://bugreports.qt-project.org/browse/QTBUG-34614
Forwarded: see bug
Applied-Upstream: nope
Reviewed-by: Jonathan Riddell
Last-Update: 2014-11-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- qt/src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100
+++ qt/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200
@@ -255,22 +255,30 @@ struct GPostEventSource
GSource source;
QAtomicInt serialNumber;
int lastSerialNumber;
+ QEventLoop::ProcessEventsFlags processEventsFlags;
QEventDispatcherGlibPrivate *d;
};
static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
{
+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
QThreadData *data = QThreadData::current();
if (!data)
return false;
+ QEventLoop::ProcessEventsFlags excludeAllFlags
+ = QEventLoop::ExcludeUserInputEvents
+ | QEventLoop::ExcludeSocketNotifiers
+ | QEventLoop::X11ExcludeTimers;
+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
+ return false;
+
gint dummy;
if (!timeout)
timeout = &dummy;
const bool canWait = data->canWaitLocked();
*timeout = canWait ? -1 : 0;
- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
return (!canWait
|| (source->serialNumber != source->lastSerialNumber));
}
@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
{
GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
source->lastSerialNumber = source->serialNumber;
- QCoreApplication::sendPostedEvents();
- source->d->runTimersOnceWithNormalPriority();
+ QEventLoop::ProcessEventsFlags excludeAllFlags
+ = QEventLoop::ExcludeUserInputEvents
+ | QEventLoop::ExcludeSocketNotifiers
+ | QEventLoop::X11ExcludeTimers;
+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
+ QCoreApplication::sendPostedEvents();
+ source->d->runTimersOnceWithNormalPriority();
+ }
return true; // i dunno, george...
}
@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
sizeof(GPostEventSource)));
postEventSource->serialNumber = 1;
+ postEventSource->processEventsFlags = QEventLoop::AllEvents;
postEventSource->d = this;
g_source_set_can_recurse(&postEventSource->source, true);
g_source_attach(&postEventSource->source, mainContext);
@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
// tell postEventSourcePrepare() and timerSource about any new flags
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
+ d->postEventSource->processEventsFlags = flags;
d->timerSource->processEventsFlags = flags;
d->socketNotifierSource->processEventsFlags = flags;
@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
while (!result && canWait)
result = g_main_context_iteration(d->mainContext, canWait);
+ d->postEventSource->processEventsFlags = savedFlags;
d->timerSource->processEventsFlags = savedFlags;
d->socketNotifierSource->processEventsFlags = savedFlags;
--- qt/src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200
+++ qt/src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200
@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
// we are awake, broadcast it
emit awake();
- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
+
+ QEventLoop::ProcessEventsFlags excludeAllFlags
+ = QEventLoop::ExcludeUserInputEvents
+ | QEventLoop::ExcludeSocketNotifiers
+ | QEventLoop::X11ExcludeTimers;
+ if ((flags & excludeAllFlags) == excludeAllFlags)
+ return false;
+ if(( flags & excludeAllFlags ) != excludeAllFlags )
+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
int nevents = 0;
const bool canWait = (d->threadData->canWaitLocked()
......@@ -42,7 +42,6 @@ buildable_appchooser_states_demos.patch
powerpcspe.diff
sh.diff
kfreebsd_monotonic_clock.diff
powerpc_designer_gstabs.diff
qt-multiarch-plugin-path-compat.diff
s390x_jscore.diff
add_missing_method_for_QBasicAtomicPointer_on_s390.patch
......@@ -53,3 +52,27 @@ qtdoc-build-offline-docs.patch
remove_addsense.patch
parisc-atomic.patch
ppc64el_configure_support.patch
# Kubuntu patches
kubuntu_10_ibus_input_method.diff
kubuntu_12_fix_stack_protector.diff
kubuntu_14_systemtrayicon.diff
kubuntu_28_xi2.1.patch
kubuntu_30_translucent_drag_pixmap.diff
kubuntu_37_cups_settings.diff
kubuntu_39_fix_medium_font.diff
kubuntu_40_disable_neon.patch
kubuntu_43_no_meego_helper.patch
kubuntu_93_disable_overlay_scrollbars.diff
kubuntu_94_xinput_valuators_fix.diff
kubuntu_95_qt_disable_bounce.diff
kubuntu_97_a11y_qt_and_qml_backport.diff
kubuntu_98_a11y_fix_crash.diff
kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff
kubuntu_qclipboard_delay.diff
kubuntu_qclipboard_fix_recursive.diff
gcc-5.diff
CVE-2015-0295.patch
CVE-2015-1858-1859.patch
CVE-2015-1860.patch
......@@ -9,6 +9,15 @@ export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
# Use -gstabs instaed of -g on armel and armhf to make the link step complete
# within buildd limitations
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armel armhf))
export CFLAGS := $(CFLAGS:-g=-gstabs)
export CXXFLAGS := $(CXXFLAGS:-g=-gstabs)
endif
ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
export CXXFLAGS := -fpermissive $(CXXFLAGS)
endif
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
# workaround to use lrelease.
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
......@@ -60,7 +69,7 @@ else
gles2_architectures := none_for_now
endif
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
extra_configure_opts += -opengl es2
extra_configure_opts += -opengl es2 -no-neon
else
extra_configure_opts += -opengl desktop \
-no-egl
......@@ -142,7 +151,7 @@ endif
-xmlpatterns \
-no-multimedia \
-audio-backend \
-phonon \
-no-phonon \
-no-phonon-backend \
-svg \
-no-webkit \
......@@ -370,13 +379,11 @@ override_dh_installchangelogs:
override_dh_strip:
$(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --dbg-package=$(pkg)-dbg;)
dh_strip $(foreach pkg,$(pkgs_dbgbin),-p$(pkg)) --dbg-package=qt4-bin-dbg
dh_strip -plibqt4-phonon
dh_strip --remaining-packages --dbg-package=libqt4-dbg
override_dh_makeshlibs:
# Specific shlibs version (e.g.: 4:4.5.2)
$(foreach pkg,$(pkgs_lib),dh_makeshlibs -p$(pkg) -V '$(pkg) (>= $(shlibs_version))' -- -c0;)
dh_makeshlibs -plibqt4-phonon -V'$(libqt4phonon_shlibs)'
# Generate shlibs local files
for pkg in $(pkgs_lib); do \
if test -e debian/$${pkg}/DEBIAN/shlibs ; then \
......