profile/ivi/qtbase.git
12 years agoRegister whether a glyph run goes from RTL or LTR
Eskil Abrahamsen Blomfeldt [Wed, 28 Sep 2011 10:36:39 +0000 (12:36 +0200)]
Register whether a glyph run goes from RTL or LTR

This is needed by scene graph when embedding text objects in
RTL text. Since the number of flags required for
QGlyphRun is increasing, I've also refactored the
underline/overline/strikethrough settings to use a common
QFlags interface.

Task-number: QTBUG-20917
Change-Id: I070649c014f4a51cfd66a9579d2d221a8f22302f
Reviewed-on: http://codereview.qt-project.org/5739
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoQTemporaryFile: Test what happens if current dir isn't writable.
David Faure [Wed, 28 Sep 2011 11:32:37 +0000 (13:32 +0200)]
QTemporaryFile: Test what happens if current dir isn't writable.

No surprises, QTemporaryFile("tempXXXXXX") fails. But that is
consistent with QFile::open, and it's documented, so ok.

Change-Id: I04c805a242aeda8327d25be238da6120b3c90f5a
Merge-request: 57
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-on: http://codereview.qt-project.org/5714
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoQTemporaryFile: use QCoreApplication::applicationName() as base filename
David Faure [Wed, 28 Sep 2011 11:32:36 +0000 (13:32 +0200)]
QTemporaryFile: use QCoreApplication::applicationName() as base filename

Merge-request: 57
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: I2a29b2ba925ea92a5299272b80164658775e9c0e
Reviewed-on: http://codereview.qt-project.org/5713
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoImplement support for QGuiApp::setOverrideCursor()
Lars Knoll [Mon, 26 Sep 2011 20:59:46 +0000 (22:59 +0200)]
Implement support for QGuiApp::setOverrideCursor()

Properly support application override cursors and move
the documentation into the proper place.

Change-Id: I0198b38e0d2e7b10f0fcae342b468e7f8341bf02
Reviewed-on: http://codereview.qt-project.org/5562
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoAdapted most QInputContext usage on widgets to QInputPanel
Pekka Vuorela [Tue, 27 Sep 2011 11:36:56 +0000 (14:36 +0300)]
Adapted most QInputContext usage on widgets to QInputPanel

Including most of stuff excluding mouse event handling
which differs between the classes.

Change-Id: Iff1e56b9c50c3f84de2d1c43a3416a1952197a17
Reviewed-on: http://codereview.qt-project.org/5640
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove support for QWidget specific input contexts
Pekka Vuorela [Fri, 23 Sep 2011 12:28:19 +0000 (15:28 +0300)]
Remove support for QWidget specific input contexts

QInputContext is migrated to QInputPanel, which allows only one
instance.

Change-Id: I4912164790d5a6bdff41e11cbe4bc4e2f9f111ec
Reviewed-on: http://codereview.qt-project.org/5641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdapt QGraphicsView from QInputContext to QInputPanel
Pekka Vuorela [Fri, 23 Sep 2011 11:29:07 +0000 (14:29 +0300)]
Adapt QGraphicsView from QInputContext to QInputPanel

Change-Id: Icbb458af7914f0af3e37ac012aa7c1cbd5f3a023
Reviewed-on: http://codereview.qt-project.org/5631
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoAdd missing Q_ENUMS macro to QInputPanel
Joona Petrell [Wed, 28 Sep 2011 08:40:05 +0000 (11:40 +0300)]
Add missing Q_ENUMS macro to QInputPanel

Change-Id: I4e27013a06ea4fc9899a8a737e90d6792e6fb3a0
Reviewed-on: http://codereview.qt-project.org/5699
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake examples build with Qt-in-namespace
Kent Hansen [Wed, 28 Sep 2011 07:49:05 +0000 (09:49 +0200)]
Make examples build with Qt-in-namespace

Change-Id: Ie4710b8f3afb44191927bab94eb47e00207cb831
Reviewed-on: http://codereview.qt-project.org/5684
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoMake qtbase build with Qt-in-namespace again
Kent Hansen [Fri, 23 Sep 2011 13:01:04 +0000 (15:01 +0200)]
Make qtbase build with Qt-in-namespace again

Change-Id: I5faa8690a05d6ec352fc69c0b69848539f2ed216
Reviewed-on: http://codereview.qt-project.org/5460
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake QTest::qWarn() use __FILE__ and __LINE__.
Jason McDonald [Thu, 25 Aug 2011 05:43:01 +0000 (15:43 +1000)]
Make QTest::qWarn() use __FILE__ and __LINE__.

This change makes QTest::qWarn() consistent with similar testlib
functions, which take __FILE__ and __LINE__.

Change-Id: I12977cb30672899ab38877b4a656f0cc0c7ea02c
Reviewed-on: http://codereview.qt-project.org/3559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRe-enable the Windows plugin.
Friedemann Kleint [Wed, 28 Sep 2011 06:59:08 +0000 (08:59 +0200)]
Re-enable the Windows plugin.

Revert 732bfbe8e8445a95965874752e586887f1dcbbc1.

Change-Id: Ia24d06b4e89936ede97c89b76214d1a9c9de9b53
Reviewed-on: http://codereview.qt-project.org/5679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdd qtcore.qdoc. The QtCore main page was missing from the docs.
Casper van Donderen [Tue, 20 Sep 2011 12:27:05 +0000 (14:27 +0200)]
Add qtcore.qdoc. The QtCore main page was missing from the docs.

Change-Id: Id81f7b11302538dee9d3459b1feb0ad93c53fada
Reviewed-on: http://codereview.qt-project.org/5519
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoUse module prefixed include paths, avoids warnings in configure.
Pekka Vuorela [Tue, 27 Sep 2011 12:19:20 +0000 (15:19 +0300)]
Use module prefixed include paths, avoids warnings in configure.

Change-Id: I081fa49073da532647836ddd1087c0f5fcf32775
Reviewed-on: http://codereview.qt-project.org/5634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoWidgets: Remove QT3_SUPPPORT.
Friedemann Kleint [Tue, 27 Sep 2011 12:48:51 +0000 (14:48 +0200)]
Widgets: Remove QT3_SUPPPORT.

Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemoved obsolete QWidget::resetInputContext()
Pekka Vuorela [Fri, 23 Sep 2011 09:13:39 +0000 (12:13 +0300)]
Removed obsolete QWidget::resetInputContext()

Replaced functionality with new QInputPanel interface.

Change-Id: I5543f725724b2b208dcf18366712a18b665439b2
Reviewed-on: http://codereview.qt-project.org/5630
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix compiler warnings.
Friedemann Kleint [Tue, 27 Sep 2011 13:18:02 +0000 (15:18 +0200)]
Fix compiler warnings.

Change-Id: I6b6d86097074a12c9c4e3d22fe61a6b962ffa21e
Reviewed-on: http://codereview.qt-project.org/5627
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSimplify QAccessibleTextEdit.
Frederik Gladhorn [Tue, 27 Sep 2011 12:28:19 +0000 (14:28 +0200)]
Simplify QAccessibleTextEdit.

Before the text edit tried to represent each line of text as a child
of itself. With the editable text interface this is no longer needed.

Change-Id: If9927e522f955e863e91fd0a529a1ce6fafaddc3
Reviewed-on: http://codereview.qt-project.org/5624
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoAlways return something.
Frederik Gladhorn [Tue, 27 Sep 2011 12:27:28 +0000 (14:27 +0200)]
Always return something.

Change-Id: I39a357295eae82b2af8b97c964924965c74e0fbd
Reviewed-on: http://codereview.qt-project.org/5623
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoRemove dead code from QAccessibleTabBar.
Frederik Gladhorn [Mon, 26 Sep 2011 08:18:30 +0000 (10:18 +0200)]
Remove dead code from QAccessibleTabBar.

Change-Id: I084259184228beea4374e8c5370f9a21064cae26
Reviewed-on: http://codereview.qt-project.org/5526
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoQAccessibleToolButton fixes.
Frederik Gladhorn [Mon, 26 Sep 2011 12:16:19 +0000 (14:16 +0200)]
QAccessibleToolButton fixes.

ToolButtons now consist of only one button.
They implement the action interface so that the menu
can be opened programmatically and the button clicked/checked.
The menu shows in the hierarchy as child of the button.

Change-Id: Ifebe5e19b4c55a9db4fb688274da906293566cc2
Reviewed-on: http://codereview.qt-project.org/5536
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoRemove debug output
Lars Knoll [Mon, 26 Sep 2011 20:58:47 +0000 (22:58 +0200)]
Remove debug output

Change-Id: I1d1884956a02bc58e760f0893ec4762e3c2f3f4d
Reviewed-on: http://codereview.qt-project.org/5560
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoPrevent potential crash in QXcbConnection::checkEvent().
Samuel Rødal [Tue, 27 Sep 2011 10:47:11 +0000 (12:47 +0200)]
Prevent potential crash in QXcbConnection::checkEvent().

Change-Id: I4b2ed85fecbfc1cc4fecfa9bb37aa0d9bd329817
Reviewed-on: http://codereview.qt-project.org/5616
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't crash if qApp->overrideCursor() is 0
Lars Knoll [Mon, 26 Sep 2011 20:59:22 +0000 (22:59 +0200)]
Don't crash if qApp->overrideCursor() is 0

Change-Id: I9e61be7ed537a988ce8ccca20f672f5c66275452
Reviewed-on: http://codereview.qt-project.org/5561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUse the drag cursor shapes
Lars Knoll [Thu, 22 Sep 2011 15:28:04 +0000 (17:28 +0200)]
Use the drag cursor shapes

Correctly use the Qt::Drag* cursor shapes
for drags. Still doesn't work as
QGuiApp::setOverrideCursor needs an implementation.

Change-Id: I60b6a647be03f3700408ee8afcfa631a18e2bcaf
Reviewed-on: http://codereview.qt-project.org/5559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix mouse coordinate translation when searching for a drop target
Lars Knoll [Thu, 22 Sep 2011 14:53:07 +0000 (16:53 +0200)]
Fix mouse coordinate translation when searching for a drop target

Correctly transform the coordinates when mapping from parent to
child in the window hierarchy. Also avoid a second roundtrip
to the xserver querying information that we already have.

Change-Id: Ia13f1c7ee20c60df283562daa4869d6db30a37e9
Reviewed-on: http://codereview.qt-project.org/5558
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUnlock the eventreader before calling handleEvent()
Lars Knoll [Thu, 22 Sep 2011 14:50:13 +0000 (16:50 +0200)]
Unlock the eventreader before calling handleEvent()

Handle event can cause accesses to the event queue from
other places (e.g. through checkEvent()). Unlock the
reader to avoid deadlocks.

Change-Id: I1e5a79ce556920127848fccc3387d711c7cd32c2
Reviewed-on: http://codereview.qt-project.org/5557
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMark QtConcurrentFilter Autotest as insignificant, because it fails rarely
Holger Ihrig [Tue, 27 Sep 2011 07:23:32 +0000 (09:23 +0200)]
Mark QtConcurrentFilter Autotest as insignificant, because it fails rarely

Task-number: QTBUG-20688

Change-Id: I17b0016c66d3a6ada873f698a97bfcdaf60838f3
Reviewed-on: http://codereview.qt-project.org/5593
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
12 years agoRe-enabled test and made it pass on Linux
Jo Asplin [Mon, 26 Sep 2011 14:54:50 +0000 (16:54 +0200)]
Re-enabled test and made it pass on Linux

Task-number: QTBUG-20753, QTBUG-21424
Change-Id: Icc4abf82c243b31b43d167df921e0585a5e89a1e
Reviewed-on: http://codereview.qt-project.org/5553
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
12 years agoUpdate QLineControl's state correctly with QT_NO_ACCESSIBLITY.
Andrew den Exter [Tue, 27 Sep 2011 07:21:16 +0000 (17:21 +1000)]
Update QLineControl's state correctly with QT_NO_ACCESSIBLITY.

Always call finishChange in setText, not just when QT_NO_ACCESSIBILITY
is undefined, otherwise lots of things don't get updated.

Task-number: QTBUG-21686
Change-Id: I58b320814fb379b462e39b7e675fe6e9fc41ba8a
Reviewed-on: http://codereview.qt-project.org/5594
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRespect the QSurfaceFormat when constructing a QOpenGLContext on Mac
Gunnar Sletta [Sat, 24 Sep 2011 09:42:12 +0000 (11:42 +0200)]
Respect the QSurfaceFormat when constructing a QOpenGLContext on Mac

Change-Id: I1a17d2e7e060d9931d84afeb0fd42bc3b1f44e5d
Reviewed-on: http://codereview.qt-project.org/5527
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoOops, adding Q_EXPORT to QPlatformScreenPageFlipper
Paul Olav Tvete [Fri, 23 Sep 2011 14:22:04 +0000 (16:22 +0200)]
Oops, adding Q_EXPORT to QPlatformScreenPageFlipper

Change-Id: I6bda579734c77201f52107db988b9a2eefefb327
Reviewed-on: http://codereview.qt-project.org/5525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed crash in QOpenGLFramebufferObject.
Samuel Rødal [Mon, 26 Sep 2011 07:33:56 +0000 (09:33 +0200)]
Fixed crash in QOpenGLFramebufferObject.

AMD's Catalyst driver returns true in glIsRenderbuffer() for a newly
gen'ed render buffer.

Change-Id: I177425dc4b94923431cec5f89175c63782819eef
Reviewed-on: http://codereview.qt-project.org/5522
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoSimplify QAccessibleDial and make it inherit QAccessibleAbstractSlider.
Frederik Gladhorn [Fri, 23 Sep 2011 08:28:51 +0000 (10:28 +0200)]
Simplify QAccessibleDial and make it inherit QAccessibleAbstractSlider.

This adds the value interface and removes the children of the dial.

Change-Id: I47eac77c01dce36db077f553054ef37353242f77
Reviewed-on: http://codereview.qt-project.org/4821
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoSimplify QAccessibleSpinboxes.
Frederik Gladhorn [Fri, 9 Sep 2011 14:06:38 +0000 (16:06 +0200)]
Simplify QAccessibleSpinboxes.

Change-Id: I2fb3ef0ccd108539d8a4abbf3bbd3fdf6d94fac2
Reviewed-on: http://codereview.qt-project.org/4823
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoUpdate QHash for Qt 5
Bradley T. Hughes [Fri, 9 Sep 2011 10:45:18 +0000 (12:45 +0200)]
Update QHash for Qt 5

Dealt with all necessary changes that are marked in the code: removing
methods left only for binary compatibility with earlier Qt 4 versions
and other methods marked for removal.

Change-Id: I47109ccd9ed40addc345416be9e172570723955e
Reviewed-on: http://codereview.qt-project.org/4534
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRe-enabled tests that are now passing on Linux
Jo Asplin [Mon, 26 Sep 2011 13:48:33 +0000 (15:48 +0200)]
Re-enabled tests that are now passing on Linux

Task-number: QTBUG-21424

Change-Id: I093d90a2713a7e7ddace31a27a08d47e3c2da588
Reviewed-on: http://codereview.qt-project.org/5546
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
12 years ago"empty translation" does not mean "no translation"
Oswald Buddenhagen [Mon, 19 Sep 2011 18:26:25 +0000 (20:26 +0200)]
"empty translation" does not mean "no translation"

this makes QCoreApplication::translate() consistent with
QTranslator::translate(), and is semantically cleaner.
users wishing to shrink their QM files can do that properly by using
lrelease -removeidentical.

Change-Id: I2b367314cfb985c3d130c7c6347e2742311f497a
Reviewed-on: http://codereview.qt-project.org/5165
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoFix warning caused by putting .mm files in SOURCES
Tor Arne Vestbø [Thu, 15 Sep 2011 10:43:22 +0000 (12:43 +0200)]
Fix warning caused by putting .mm files in SOURCES

They should live in OBJECTIVE_SOURCES instead.

Change-Id: Iaf3f6ae4d8b71600c8ea91e33cf860b326855988
Reviewed-on: http://codereview.qt-project.org/4971
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
12 years agoFix possible assert in QFontEngineFT
Eskil Abrahamsen Blomfeldt [Mon, 26 Sep 2011 12:34:15 +0000 (14:34 +0200)]
Fix possible assert in QFontEngineFT

This is a regression caused by 070d9c00. If the defaultFormat
is set to Format_None, we should default to Format_A8 like before
the change.

Change-Id: I8ad07abff96fc1dfa03c0c5b49d13beb36b9de70
Reviewed-on: http://codereview.qt-project.org/5540
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoAdd some enablers to QTextDocumentLayout
Eskil Abrahamsen Blomfeldt [Fri, 23 Sep 2011 10:50:44 +0000 (12:50 +0200)]
Add some enablers to QTextDocumentLayout

Required to access internals used in the layout process, so that
we can present the layout in the scenegraph. For instance, the
frameBoundingRect() for tables will be the internal bounding rect
of the cells. To avoid regressions, I've added a separate function
for the outer bounding rect. For now, this is private API, but if
it turns out to be useful, the functions can easily be added as
virtual to QAbstractTextDocumentLayout.

Task-number: QTBUG-20917
Change-Id: I04e07d3850b21f9f0704bf8c8a3ffe97ee5c3fda
Reviewed-on: http://codereview.qt-project.org/5539
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFix possible crash in QFontEngineFT
Eskil Abrahamsen Blomfeldt [Mon, 26 Sep 2011 10:18:46 +0000 (12:18 +0200)]
Fix possible crash in QFontEngineFT

Avoid crash if set pointer is null.

Task-number: QTBUG-21647
Reviewed-by: Jiang Jiang
(cherry picked from commit e05734987594f0e54f58a2ab3037cdf4956e9036)

Change-Id: I49fde194ef6be5485a43c5d09fc43170ab9d4d6b
Reviewed-on: http://codereview.qt-project.org/5532
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoMake QVectorData::shared_null const
Bradley T. Hughes [Fri, 9 Sep 2011 09:07:48 +0000 (11:07 +0200)]
Make QVectorData::shared_null const

Similar to QByteArray and QString, keep the shared_null in shareable
memory and never modify it.

Since QRegion uses the internals of QVector, we need to make sure that
QRegion also never modifies the shared_null.

Change-Id: I809e5873fe414138f97d501e05458b73c04b18fb
Reviewed-on: http://codereview.qt-project.org/4529
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFixed tst_QWidget::updateWhileMinimized()
Samuel Rødal [Thu, 22 Sep 2011 08:43:52 +0000 (10:43 +0200)]
Fixed tst_QWidget::updateWhileMinimized()

The QBackingStore::sync() call after the first expose when the widget is
un-minimized is discarded due to Qt::WA_Mapped being false. Since there
might be backing store syncs pending on Qt::WA_Mapped being set we
should also call syncBackingStore() when we get the map event.

Change-Id: I762545dc0522a99f0b36ce9a2cd2f45894cb40a5
Reviewed-on: http://codereview.qt-project.org/5377
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoTidy and sort the list of selftests
Jason McDonald [Fri, 23 Sep 2011 01:41:16 +0000 (11:41 +1000)]
Tidy and sort the list of selftests

Change-Id: I123a775e2d56fc0c64d43e98a1d2e3ab68394076
Reviewed-on: http://codereview.qt-project.org/5492
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse placeholder for Qt version in expected output
Jason McDonald [Thu, 22 Sep 2011 07:40:45 +0000 (17:40 +1000)]
Use placeholder for Qt version in expected output

The selftests already used the @INSERT_QT_VERSION_HERE@ placeholder
in place of the real Qt and QTestlib versions in the expected test
output of the subtests.  For unknown reasons, the same was not true for
the expected plain text output.  In the past, this has caused Release
Managers to waste time incrementing the version numbers in these files.

Change-Id: I52f7870486fce128c04d53ff06978afa947474fd
Reviewed-on: http://codereview.qt-project.org/5375
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRe-enabled test that was marked insignificant and passes
Holger Ihrig [Thu, 22 Sep 2011 14:36:20 +0000 (16:36 +0200)]
Re-enabled test that was marked insignificant and passes

Added comment why QVariant Autotest is marked insignificant

Task-number: QTBUG-21424

Change-Id: I5b911bd36e376ad529342055180ff9c5de19de67
Reviewed-on: http://codereview.qt-project.org/5399
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake QMapData::shared_null const
Bradley T. Hughes [Fri, 9 Sep 2011 09:08:25 +0000 (11:08 +0200)]
Make QMapData::shared_null const

Similar to QVector, QByteArray and QString, keep the shared_null in
shareable memory and never modify it.

Change-Id: I062825684b79f2b01ec7ce65e0cf74f417b760b8
Reviewed-on: http://codereview.qt-project.org/4530
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake QListData::shared_null const
Bradley T. Hughes [Fri, 9 Sep 2011 09:09:16 +0000 (11:09 +0200)]
Make QListData::shared_null const

Similar to QMap, QVector, QByteArray and QString, keep the shared_null
in shareable memory and never modify it.

Change-Id: I2b4bb8de564080021043f6ede6c903d567c686cf
Reviewed-on: http://codereview.qt-project.org/4531
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake QLinkedListData::shared_null const
Bradley T. Hughes [Fri, 9 Sep 2011 09:10:48 +0000 (11:10 +0200)]
Make QLinkedListData::shared_null const

Similar to QList, QMap, QVector, QByteArray and QString, keep the
shared_null in shareable memory and never modify it.

Change-Id: I70b484d528c397a9d205b1418b6dc920c69dc725
Reviewed-on: http://codereview.qt-project.org/4532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake QHashData::shared_null const
Bradley T. Hughes [Fri, 9 Sep 2011 09:18:28 +0000 (11:18 +0200)]
Make QHashData::shared_null const

Similar to QLinkedList QList, QMap, QVector, QByteArray and QString,
keep the shared_null in shareable memory and never modify it.

Change-Id: Ia8b72ef0288575bed658153d9d54434580988bda
Reviewed-on: http://codereview.qt-project.org/4533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agodon't calculate hash when the map is empty and we are not inserting
Oswald Buddenhagen [Tue, 20 Sep 2011 09:13:47 +0000 (11:13 +0200)]
don't calculate hash when the map is empty and we are not inserting

the alternative would be splitting the function into two separate
overloads. that might result in better branch prediction, but will
create a bit more code.

Change-Id: Ia2c685bbb34a9681c71f2249d073dd960368209a
Reviewed-on: http://codereview.qt-project.org/5332
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDoc: Fixed \since declarations.
David Boddie [Thu, 30 Jun 2011 17:16:21 +0000 (19:16 +0200)]
Doc: Fixed \since declarations.
(cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
(cherry picked from commit 16355187f69d4431b79b05201b36729c8e5102fe)

Change-Id: Idb18570df01c7463e0dc0f78fd05f80372afa64f
Reviewed-on: http://codereview.qt-project.org/1983
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
12 years agoDoc: Clarified the range of return values from QLineF::angle().
David Boddie [Thu, 30 Jun 2011 18:48:32 +0000 (20:48 +0200)]
Doc: Clarified the range of return values from QLineF::angle().

Task-number: QTBUG-20197
(cherry picked from commit 86608d537eabc3cf7e1d1ddd1d0a2f90ccc2de2a)
(cherry picked from commit 8a6dc154ef1fa71e85f02d011d6cbeb63e2ca3bb)

Change-Id: I40cfba4ee45f61428b00d4044640f600c462d564
Reviewed-on: http://codereview.qt-project.org/1984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
12 years agoDoc: Moved general notes about character conversion.
David Boddie [Mon, 18 Jul 2011 13:02:45 +0000 (15:02 +0200)]
Doc: Moved general notes about character conversion.

Task-number: QTBUG-20411
(cherry picked from commit b3922d06680c04324cecd0e0219d02c52b8cf7fd)

Change-Id: If2730fa0d8abd6a14070bc19c8c307dbb61ca111
Reviewed-on: http://codereview.qt-project.org/1985
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
12 years agoDoc: Fixed page step sizes in a snippet for QAbstractScrollArea.
David Boddie [Mon, 18 Jul 2011 14:30:23 +0000 (16:30 +0200)]
Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.

Task-number: QTBUG-20350
(cherry picked from commit df244b77b3a5370db071cd1a08f9e24c8cd78803)

Change-Id: Idce02f2f417d8e897d96372f78812e9cef0d79b0
Reviewed-on: http://codereview.qt-project.org/1986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
12 years agoDoc: Fixed shader program snippet.
David Boddie [Tue, 19 Jul 2011 14:52:20 +0000 (16:52 +0200)]
Doc: Fixed shader program snippet.

Task-number: QTBUG-18982
Reviewed-by: Kim Motoyoshi Kalland
(cherry picked from commit 41287c411cb4b1019d12a49ddf7a738174a42f25)

Change-Id: I416411623037830abadbb3cf0a9d1d7aad6f1b96
Reviewed-on: http://codereview.qt-project.org/1987
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
12 years agoAdded missing license headers.
Rohan McGovern [Mon, 26 Sep 2011 00:15:10 +0000 (10:15 +1000)]
Added missing license headers.

Change-Id: Id3b7e12abe6ed60f34229ec3a0828f423efdfebf
Reviewed-on: http://codereview.qt-project.org/5477
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRemove obsolete exclusion from selftest checking
Jason McDonald [Thu, 22 Sep 2011 07:14:42 +0000 (17:14 +1000)]
Remove obsolete exclusion from selftest checking

There is no test with a datatag "float", so this code is never executed.

Change-Id: I9dd234e6575eb1c33075705edf77eb1d977061c9
Reviewed-on: http://codereview.qt-project.org/5362
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't XFAIL on the contents of assert messages.
Jason McDonald [Thu, 22 Sep 2011 06:35:56 +0000 (16:35 +1000)]
Don't XFAIL on the contents of assert messages.

Q_ASSERT uses __FILE__, which has undefined contents, and thus the
selftest cannot always match Q_ASSERT messages in actual output with
those in expected output.  The test was calling QEXPECT_FAIL() in this
case, but doing so implies that (a) it's a failure and (b) we intend to
fix it one day.  Neither of these is true, so instead we should simply
tolerate this difference in actual and expected outputs, in the same way
that we do in a couple of other similar cases.

Change-Id: I8b8609a400e9b798936875f6eb1ca18a83660efc
Reviewed-on: http://codereview.qt-project.org/5358
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoImplement QTEST_GUILESS_MAIN
Jan Kundrát [Sat, 13 Nov 2010 23:06:07 +0000 (00:06 +0100)]
Implement QTEST_GUILESS_MAIN

Add support for test cases which require an event loop, but do not need
GUI up and running.  Such cases are best accommodated by code similar to
QTEST_MAIN, but using QCoreApplication instead of QApplication.

Change-Id: I04ce82d26b80a4edeba6bf7604a7f8d974232a11
Merge-request: 919
Reviewed-on: http://codereview.qt-project.org/5427
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoUse the right callback in QObject::disconnect()
Olivier Goffart [Fri, 23 Sep 2011 18:42:50 +0000 (20:42 +0200)]
Use the right callback in QObject::disconnect()

Change-Id: Idf2f725dd859aa5c960e5889678cac0e139e44b0
Reviewed-on: http://codereview.qt-project.org/5475
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake sure cursor position doesn't exceed line end
Jiang Jiang [Mon, 19 Sep 2011 11:20:13 +0000 (13:20 +0200)]
Make sure cursor position doesn't exceed line end

If we have trailing spaces at the end of a line, cursor will disappear
because the position we returned exceeds line end, thus the widget
border. By limiting it within line.width we can make sure it always
visible, which is more consistent to the behavior in common platforms.

Reviewed-by: Eskil
(cherry picked from commit c750afe0e0f043389d30850070889946e4c6e8af)

Change-Id: Ifc60b718369639bbb6f5afb35c29a6eb0dccd219
Reviewed-on: http://codereview.qt-project.org/5458
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoRe-enabling tests that were marked insignificant but not failing
Holger Ihrig [Fri, 23 Sep 2011 10:57:42 +0000 (12:57 +0200)]
Re-enabling tests that were marked insignificant but not failing

Task-number: QTBUG-21402

Change-Id: Ibcc2cff81aff669c02b1b7b2c0cb599646b0dd61
Reviewed-on: http://codereview.qt-project.org/5455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
12 years agoFix QString and QByteArray reserve() and squeeze()
Bradley T. Hughes [Fri, 23 Sep 2011 10:29:18 +0000 (12:29 +0200)]
Fix QString and QByteArray reserve() and squeeze()

These functions should not take care not to unconditionally set the
capacityReserved private member, since the d may be referencing the
const shared_null or shared_empty which live in read-only memory.

The squeeze() methods check for ref > 1 instead of ref != 1 to prevent
detaching from the shared_null/shared_empty unnecessarily; the
shared_null/shared_empty ref count is -1, meaning squeeze() will never
detach from it.

Change-Id: Id3f1725a6f08b3a462343640a47bbe78f08ca7e7
Rubberstamped-by: Lars Knoll
Reviewed-on: http://codereview.qt-project.org/5454
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQByteArray's shared_null and shared_empty should be const
Bradley T. Hughes [Fri, 9 Sep 2011 09:02:06 +0000 (11:02 +0200)]
QByteArray's shared_null and shared_empty should be const

QByteArray::squeeze() needs to make sure to detach if the
data is shared, otherwise it would end up crashing when
squeeze() is called on a QByteArray using the shared_null
or shared_empty.

Change-Id: I89c178659d8c7448681304f050fd69e17b2387de
Reviewed-on: http://codereview.qt-project.org/4528
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove Q_GLOBAL_STATIC_WITH_INITIALIZER from QtWidgets
Lars Knoll [Thu, 15 Sep 2011 20:28:07 +0000 (22:28 +0200)]
Remove Q_GLOBAL_STATIC_WITH_INITIALIZER from QtWidgets

Change-Id: Iecad85fbbfabe41c3a332be2ee0ce3a643db7731
Reviewed-on: http://codereview.qt-project.org/5025
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoImplemented QWidget's move() vs setGeometry() distinction in QWindow.
Samuel Rødal [Thu, 22 Sep 2011 12:37:58 +0000 (14:37 +0200)]
Implemented QWidget's move() vs setGeometry() distinction in QWindow.

QWidget's move() sets the position of the window including the window
frame, unlike setGeometry(). There was no equivalent for this in
QWindow, so several QWidget auto-tests were failing. Now we add
setFramePos() to achieve the same purpose in QWindow.

This fixes tst_QWidget::windowState(), which uses move().

Change-Id: I9a3e558bd615a8f0234cc3dd94fbb2bf5ecbc148
Reviewed-on: http://codereview.qt-project.org/5405
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoPatch toward fixing tst_QWidget::windowState().
Samuel Rødal [Thu, 22 Sep 2011 07:05:11 +0000 (09:05 +0200)]
Patch toward fixing tst_QWidget::windowState().

In QWidget::setWindowState() there was some code to emulate window
states when they're not supported by the backend, by hiding the window
on minimize or using the screen geometry and the frameless window hint
to manually try to make a window fullscreen.

However, some of this code was being run even when the backend does
support setting window states, specifically calling setParent(0) to
force a re-creation of the platform window and calling show(). These led
to the window getting the wrong position after being minimized or
fullscreen and going back to the normal state.

Apart from storing the normal geometry of a widget when going away from
the normal state we shouldn't do any magic when the call to
QPlatformWindow::setWindowState() succeeds.

tst_QWidget::windowState() still fails due to calling move() to set the
position of the widget including the frame, when QWindow currently only
supports setting the position of the widget excluding the frame.

Change-Id: I1c1a337d3c15f14c1c842bd1e347f94e6b67d7eb
Reviewed-on: http://codereview.qt-project.org/5367
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't flood expose events in the xcb plugin.
Samuel Rødal [Thu, 22 Sep 2011 07:02:40 +0000 (09:02 +0200)]
Don't flood expose events in the xcb plugin.

The X server sends a series of expose events, where the count member
specifies how many expose events are remaining in the current series. By
merging them into an expose region we can send a single expose event to
the lighthouse interface.

Change-Id: If73c9972fe02c5e4137e8742aaaf5679ccea5a09
Reviewed-on: http://codereview.qt-project.org/5366
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoOnly set frame margins as dirty when we get a configure notify event.
Samuel Rødal [Thu, 22 Sep 2011 07:00:55 +0000 (09:00 +0200)]
Only set frame margins as dirty when we get a configure notify event.

It's dangerous to set them as dirty in anticipation of a configure
notify event, as if frameMargins() is called before the event is
received the computed values are bogus.

Change-Id: Ib6db975fba5fcb13a2511e4716cbb5ca79265c34
Reviewed-on: http://codereview.qt-project.org/5365
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFixed geometry issues.
Samuel Rødal [Wed, 21 Sep 2011 15:39:34 +0000 (17:39 +0200)]
Fixed geometry issues.

We need to compare against the window's currently known geometry to know
when to send resize and move events. Also make sure at least one resize
event is sent, instead of sending one before each expose.

Change-Id: Id7ebe4c1c0e723af9198c668a0c736d64efdbf3e
Reviewed-on: http://codereview.qt-project.org/5364
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAccessible ComboBox: remove virt children, add actions.
Frederik Gladhorn [Thu, 15 Sep 2011 22:40:41 +0000 (00:40 +0200)]
Accessible ComboBox: remove virt children, add actions.

Simplify the combobox implementation by removing child logic.
Instead have an option to open the combobox.

Change-Id: I1bb517d0d064aefa28594b8fa957b8b2c9d48e88
Reviewed-on: http://codereview.qt-project.org/5032
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoAdd autotest for QInputPanel
Joona Petrell [Thu, 22 Sep 2011 13:43:27 +0000 (16:43 +0300)]
Add autotest for QInputPanel

Change-Id: I8ac28d93f610cd3eb69087d2c961a5aab6c47e1e
Reviewed-on: http://codereview.qt-project.org/5394
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't call ref() in QByteArray::QByteArray()
Bradley T. Hughes [Mon, 12 Sep 2011 06:44:32 +0000 (08:44 +0200)]
Don't call ref() in QByteArray::QByteArray()

The call is unnecessary; it does nothing since the shared_null ref count
is negative.

Change-Id: I0d0c35a554e4fc5b734a25dab06f04bee7a9ae24
Reviewed-on: http://codereview.qt-project.org/4637
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRe-enabled test and made it pass on Linux
Jo Asplin [Thu, 22 Sep 2011 13:09:37 +0000 (15:09 +0200)]
Re-enabled test and made it pass on Linux

Task-number: QTBUG-21424

Change-Id: Ie63380f22d299708b2085652389869cac841e249
Reviewed-on: http://codereview.qt-project.org/5388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
12 years agoRe-enabled test and made it pass on Linux
Jo Asplin [Thu, 22 Sep 2011 11:47:10 +0000 (13:47 +0200)]
Re-enabled test and made it pass on Linux

Task-number: QTBUG-21402

Change-Id: I54226c0aa63c70f9bb8ed8be3784918dd70e5592
Reviewed-on: http://codereview.qt-project.org/5382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
12 years agoSupport adding application fonts with QFontconfigDatabase
Jiang Jiang [Thu, 22 Sep 2011 12:23:29 +0000 (14:23 +0200)]
Support adding application fonts with QFontconfigDatabase

QFontDatabaseQPA should be able to reinitialize database and
reregister all the fonts when an application font is added, because
it will trigger db->invalidate().

Add cloneWithSize support to QFontEngineBox so that even no usable
font is found in QFontDatabase, QRawFont::setPixelSize can still
work (without making the result rawfont invalid).

Register application fonts with QFontconfigDatabase, the code is
adapted from QFontDatabaseX11.

Reenable QRawFont tests for QPA, these usages are now supported in
QPA.

Fix QStaticText tests, raster in QPA does support transformations.
Translate the text before ZAxix rotation so that it will be visible
in canvas.

Add back fixedPitch support to QPA, and fix QFontDatabase tests.

Fix QGlyphRun tests, ignore non-existence glyphs in alphaMap
locking.

Fix QFontMetrics tests.

Task-number: QTBUG-21415, QTBUG-20754, QTBUG-20977,
             QTBUG-20976, QTBUG-20760, QTBUG-20759
Change-Id: I24aea7d6ec6b2ac6342134d1f2591327c23a692b
Reviewed-on: http://codereview.qt-project.org/5384
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoAvoid crash in handleTouchEvent and remove superfluous mapping.
Laszlo Agocs [Fri, 23 Sep 2011 08:11:10 +0000 (11:11 +0300)]
Avoid crash in handleTouchEvent and remove superfluous mapping.

252d1b34b26779cbc1ac269f4af7fdb1f27038ef introduces a mapFromGlobal
call in QWindowSystemInterface::handleTouchEvent. This has two issues:
It ignores the fact that the tlw parameter can be null, resulting in
an instant crash with the touch support of some platforms, and the
mapping itself is unneccessary because
QGuiApplication::processTouchEvent() will perform the same, the
rect set via setRect() is basically ignored due to the touchPoint.d.rect
= ... just before sending the final event to the widget in qguiapplication.cpp.

Using setScreenRect instead of setRect is a valid fix from the
previous patch, but the parts for the mapping need to be removed.

Change-Id: I0bb40c7d647fb062106b151e5987f9970d6ab2c8
Reviewed-on: http://codereview.qt-project.org/5448
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
12 years agoFix preedit text on XCB
Eskil Abrahamsen Blomfeldt [Thu, 22 Sep 2011 12:52:48 +0000 (14:52 +0200)]
Fix preedit text on XCB

indexOfMethod() requires a full signature, not just a method name.

Change-Id: Icb15ab46cab61b35f5d56e8e94b71f5e3b72f97a
Reviewed-on: http://codereview.qt-project.org/5386
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoPage flipping API for QPlatformScreen
Paul Olav Tvete [Thu, 22 Sep 2011 12:30:40 +0000 (14:30 +0200)]
Page flipping API for QPlatformScreen

Adding a page flipping API for platform plugins. This
enables Wayland compositors to show full-screen client windows directly
without copying any data - if supported by the platform.

Change-Id: I19abe366434140f9e20a0655fe7cd41ea9264fca
Reviewed-on: http://codereview.qt-project.org/5385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAccessible SpinBox remove dead code.
Frederik Gladhorn [Thu, 15 Sep 2011 20:37:59 +0000 (22:37 +0200)]
Accessible SpinBox remove dead code.

Change-Id: I8f3110a1683af98af605982277a618aa0ba97a64
Reviewed-on: http://codereview.qt-project.org/4822
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoworkaround XCB-ICCCM 3.8 breakage, second instance
Oswald Buddenhagen [Wed, 21 Sep 2011 09:10:51 +0000 (11:10 +0200)]
workaround XCB-ICCCM 3.8 breakage, second instance

Change-Id: Ic456f6ca9d845f50506b41d71bb5d2b83239a37e
Reviewed-on: http://codereview.qt-project.org/5333
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoCast back to QWindow *
Jo Asplin [Thu, 15 Sep 2011 11:09:44 +0000 (13:09 +0200)]
Cast back to QWindow *

Tests for widgets should select the
QWidget * version of overloaded QTestLib
functions rather than the QWindow * version.

Change-Id: I8b540b630758c0e7ba7ed88aba45d624c83ff378
Reviewed-on: http://codereview.qt-project.org/4977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
12 years agoAllow tests to log to multiple destinations
Jason McDonald [Fri, 2 Sep 2011 09:08:21 +0000 (19:08 +1000)]
Allow tests to log to multiple destinations

Each destination and the format of output to write there is specified by
adding "-o filename,format" to the command-line.  The special filename
"-" indicates that the log output is written to the standard output
stream, though standard output can be used as a destination at most
once.

The old-style testlib output options are still supported, but can only
be used to specify one logging destination, as before.

If no logging options are given on the command-line, a plain text log
will go to the console, as before.

To log to the console in plain text and to the file "test_output" in
xunit format, one would invoke a test in the following way:

    tst_foo -o test_output,xunitxml -o -,txt

This commit also enhances the selftests to test with multiple loggers,
but negative tests (e.g. bad combinations of command-line options) are
left for future task QTBUG-21567.

Task-number: QTBUG-20615
Change-Id: If91e752bc7001657e15e427aba9d25ab0a29a0b0
Reviewed-on: http://codereview.qt-project.org/4125
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoEnable testlib self-testing with multiple loggers
Jason McDonald [Wed, 21 Sep 2011 01:39:07 +0000 (11:39 +1000)]
Enable testlib self-testing with multiple loggers

Modify the selftest to be able to run each subtest with a list of one or
more test loggers.  The addition of tests that use this capability will
be part of a subsequent commit.

Task-number: QTBUG-20615
Change-Id: Iac3efe8220e8245aa7e5589348d2c86b8034dd28
Reviewed-on: http://codereview.qt-project.org/5292
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCocoa: Enable native menus.
Morten Sorvig [Mon, 12 Sep 2011 10:31:35 +0000 (12:31 +0200)]
Cocoa: Enable native menus.

Fix menu duplication bug: make QCocoaMenu::addAction
do nothing before the native menu has ben created.

Change-Id: Ifca192421f2073264de9f5faeb053008ecb8532e
Reviewed-on: http://codereview.qt-project.org/5135
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAllocate 16-byte aligned memory independent of platform for raster pool.
Samuel Rødal [Thu, 8 Sep 2011 11:10:47 +0000 (13:10 +0200)]
Allocate 16-byte aligned memory independent of platform for raster pool.

Fixes crash on MIPS (see original merge request
https://qt.gitorious.org/qt/qt/merge_requests/1366).

Reviewed-by: Olivier Goffart
(cherry picked from commit 786b85b13bc884a8b7eab59c43d6c393863fc470)

Change-Id: Ia7731d3d670c0c4dccab861e5085b03a6bf6f4f0
Reviewed-on: http://codereview.qt-project.org/4562
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoAccessible Slider: Remove virtual children.
Frederik Gladhorn [Wed, 21 Sep 2011 11:38:49 +0000 (13:38 +0200)]
Accessible Slider: Remove virtual children.

Change-Id: I58eca7d807b046b312117f9dbec6e2e36b5332cf
Reviewed-on: http://codereview.qt-project.org/4820
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoExport QTextImageHandler and add accessor for image
Eskil Abrahamsen Blomfeldt [Tue, 20 Sep 2011 08:19:18 +0000 (10:19 +0200)]
Export QTextImageHandler and add accessor for image

To allow optimizations in the scene graph, we export the private
QTextImageHandler class and add a function which will fetch
a given image when required, or return the cached image in the
document resources.

Task-number: QTBUG-20917
Change-Id: If45e51b0d9a267bc198623165e7a2cc1fb2b961f
Reviewed-on: http://codereview.qt-project.org/5227
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agotestlib: Separate the gui- and widgets-specific api
Kent Hansen [Wed, 21 Sep 2011 07:23:51 +0000 (09:23 +0200)]
testlib: Separate the gui- and widgets-specific api

Group the widgets-specific ("legacy") api under as
few ifdefs as possible. (The diff can look confusing;
rest assured that this change "only" moves entire
functions around in the files.)

Change-Id: I27bdec7d1c96d0b040dc22a8fed17e4e47766276
Reviewed-on: http://codereview.qt-project.org/5290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
12 years agoFix QApplication::startDragDistance()
Kevin Simons [Wed, 21 Sep 2011 10:19:46 +0000 (12:19 +0200)]
Fix QApplication::startDragDistance()

Change-Id: I1b95e25892935b2b6287b8fed719479e37dbcad5
Reviewed-on: http://codereview.qt-project.org/5308
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAccessible Scrollbar: Remove unused function.
Frederik Gladhorn [Thu, 15 Sep 2011 20:35:10 +0000 (22:35 +0200)]
Accessible Scrollbar: Remove unused function.

The default implementation returns the
right role already.

Change-Id: I29146e70cef56a65e2073581ac63cf54e39be89d
Reviewed-on: http://codereview.qt-project.org/5027
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agomerge translate() overloads
Oswald Buddenhagen [Mon, 19 Sep 2011 18:18:08 +0000 (20:18 +0200)]
merge translate() overloads

Change-Id: I58f0d2c2ec6da751860a90096c49c662658643c1
Reviewed-on: http://codereview.qt-project.org/5164
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoAccessible Scrollbar: Remove virtual children, value interface
Frederik Gladhorn [Thu, 8 Sep 2011 17:05:18 +0000 (19:05 +0200)]
Accessible Scrollbar: Remove virtual children, value interface

Change-Id: I3a8e74130eb79d289143cb7ac7b8c47cdd3db90c
Reviewed-on: http://codereview.qt-project.org/4819
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoFixes to the Xdnd code in xcb
Lars Knoll [Tue, 20 Sep 2011 16:11:39 +0000 (18:11 +0200)]
Fixes to the Xdnd code in xcb

Make sure we move the drag pixmap when required,
and readd some commented out code from Qt 4.x.

Change-Id: Ib4302b394f4ac7b966d0146267651b9c3860c62b
Reviewed-on: http://codereview.qt-project.org/5262
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix support for drag pixmaps
Lars Knoll [Tue, 20 Sep 2011 16:10:39 +0000 (18:10 +0200)]
Fix support for drag pixmaps

Re-add the support for drag pixmaps to qdnd.
Use the new WindowTransparentForMouseEvents
flag for the window that shows the drag pixmap.

Change-Id: I4b594085c161475988b9be0ffdc02c75fcc37f66
Reviewed-on: http://codereview.qt-project.org/5261
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd Qt::WindowTransparentForMouseEvents
Lars Knoll [Tue, 20 Sep 2011 16:09:08 +0000 (18:09 +0200)]
Add Qt::WindowTransparentForMouseEvents

Add a flag for output only windows that are
transparent for mouse events and implement it
for the xcb backend.

Change-Id: I24afdb6b27de34bcdf0c061a5a4987ac2880e4ae
Reviewed-on: http://codereview.qt-project.org/5260
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoCreate the window when needed
Lars Knoll [Mon, 19 Sep 2011 19:10:07 +0000 (21:10 +0200)]
Create the window when needed

We need to create the XWindow here to
avoid crashes, when resizing the backing store
before creating the window.

Change-Id: Ib8d9efca3552e5a91f5f63a9262449080ae301e5
Reviewed-on: http://codereview.qt-project.org/5259
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoReturn the correct geometry
Lars Knoll [Mon, 19 Sep 2011 19:08:36 +0000 (21:08 +0200)]
Return the correct geometry

When the platform window is created, it is the
authorative source for geometry information.

It would however be better if we could completely
avoid duplicated places for the geometry data.

Change-Id: Id90b24b9c40acb57f3d11b8b927292c06bac335e
Reviewed-on: http://codereview.qt-project.org/5258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>