Commit Graph

2148 Commits

Author SHA1 Message Date
Jason McDonald
cb57d36f45 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>
2011-09-28 12:17:45 +02:00
Friedemann Kleint
24b99f819c Re-enable the Windows plugin.
Revert 732bfbe8e8.

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>
2011-09-28 12:17:24 +02:00
Casper van Donderen
165a0b0187 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>
2011-09-28 10:46:19 +02:00
Pekka Vuorela
e3bdcb1d62 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>
2011-09-28 03:18:26 +02:00
Friedemann Kleint
a85d343a39 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>
2011-09-28 03:18:16 +02:00
Pekka Vuorela
3b6bb13e6a 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>
2011-09-28 03:18:03 +02:00
Friedemann Kleint
36850d5cec 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>
2011-09-28 03:17:51 +02:00
Frederik Gladhorn
e918598e2d 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>
2011-09-28 03:17:28 +02:00
Frederik Gladhorn
96b6a16220 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>
2011-09-28 03:17:25 +02:00
Frederik Gladhorn
34f0f0bf7d 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>
2011-09-28 03:17:22 +02:00
Frederik Gladhorn
eee2de6aa1 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>
2011-09-28 03:17:19 +02:00
Lars Knoll
8655e4bef4 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>
2011-09-28 03:17:16 +02:00
Samuel Rødal
187184b6c7 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>
2011-09-28 03:17:13 +02:00
Lars Knoll
926d6189bf 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>
2011-09-28 03:17:10 +02:00
Lars Knoll
009480275e 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>
2011-09-28 03:17:07 +02:00
Lars Knoll
66f8be7b73 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>
2011-09-28 03:17:04 +02:00
Lars Knoll
c4049750e7 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>
2011-09-28 03:16:56 +02:00
Holger Ihrig
867e6d208c 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>
2011-09-28 03:16:46 +02:00
Jo Asplin
22a83f364e 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>
2011-09-28 01:15:38 +02:00
Andrew den Exter
4bbcbec3fa 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>
2011-09-27 09:58:44 +02:00
Gunnar Sletta
fff26f6287 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>
2011-09-27 05:15:38 +02:00
Paul Olav Tvete
9457f8ea91 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>
2011-09-27 05:15:34 +02:00
Samuel Rødal
d7836ec1bd 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>
2011-09-27 05:15:28 +02:00
Frederik Gladhorn
eddd87826e 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>
2011-09-27 05:15:23 +02:00
Frederik Gladhorn
a8dc1b15dc 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>
2011-09-27 05:15:09 +02:00
Bradley T. Hughes
c7fa7475c9 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>
2011-09-26 19:04:06 +02:00
Jo Asplin
d13afe497a 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>
2011-09-26 18:47:24 +02:00
Oswald Buddenhagen
187ee8842b "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>
2011-09-26 18:20:05 +02:00
Tor Arne Vestbø
37845c730d 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>
2011-09-26 16:05:36 +02:00
Eskil Abrahamsen Blomfeldt
07107959ec 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>
2011-09-26 16:05:36 +02:00
Eskil Abrahamsen Blomfeldt
c87dcd9a5d 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>
2011-09-26 16:05:36 +02:00
Eskil Abrahamsen Blomfeldt
1cfee04d5e 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>
2011-09-26 16:05:36 +02:00
Bradley T. Hughes
54255f7c5e 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>
2011-09-26 16:05:36 +02:00
Samuel Rødal
67fec4a5f5 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>
2011-09-26 09:38:52 +02:00
Jason McDonald
412e6b754f 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>
2011-09-26 07:50:20 +02:00
Jason McDonald
9f883c7571 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>
2011-09-26 07:50:20 +02:00
Holger Ihrig
f57f01e201 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>
2011-09-26 07:50:20 +02:00
Bradley T. Hughes
564086b366 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>
2011-09-26 07:50:20 +02:00
Bradley T. Hughes
cc3bf12ef6 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>
2011-09-26 07:50:20 +02:00
Bradley T. Hughes
f8f501ec98 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>
2011-09-26 07:50:20 +02:00
Bradley T. Hughes
1173d0420e 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>
2011-09-26 07:50:20 +02:00
Oswald Buddenhagen
f6e0aa3a0f 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>
2011-09-26 07:50:20 +02:00
David Boddie
bbd02d7086 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>
2011-09-26 05:56:22 +02:00
David Boddie
94046ab192 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>
2011-09-26 05:56:22 +02:00
David Boddie
6c588c52da 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>
2011-09-26 05:56:22 +02:00
David Boddie
99324802de 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>
2011-09-26 05:56:22 +02:00
David Boddie
72aeb207c5 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>
2011-09-26 05:56:22 +02:00
Rohan McGovern
ebd86ae7f1 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>
2011-09-26 03:08:11 +02:00
Jason McDonald
ce258242b8 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>
2011-09-26 03:03:09 +02:00
Jason McDonald
b211dd93a7 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>
2011-09-26 03:02:46 +02:00