profile/ivi/qtbase.git
13 years agoImport symbol from QtGui rather than export from QtWidgets.
Kim Motoyoshi Kalland [Mon, 10 Oct 2011 16:26:50 +0000 (18:26 +0200)]
Import symbol from QtGui rather than export from QtWidgets.

The symbol is exported in qguivariant.cpp.

Change-Id: I3ba3446251aa3ba9e901bd3e9c2157d8b22d9866
Reviewed-on: http://codereview.qt-project.org/6364
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix typo in qfontengine_win
Kent Hansen [Wed, 5 Oct 2011 10:08:04 +0000 (12:08 +0200)]
Fix typo in qfontengine_win

Task-number: QTBUG-20482

Change-Id: I3fd072af019a0e531d60a1751a6a32ea5962aac1
Reviewed-on: http://codereview.qt-project.org/6049
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoPrevent 'Argument "" isn't numeric' warning when module version is missing
Tor Arne Vestbø [Tue, 11 Oct 2011 10:46:33 +0000 (12:46 +0200)]
Prevent 'Argument "" isn't numeric' warning when module version is missing

Change-Id: I2ecef7060c1e436e499221cac03266744a9ee309
Reviewed-on: http://codereview.qt-project.org/6432
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoadd qmetaobjectbuilder to qtbase.
Lorn Potter [Mon, 10 Oct 2011 04:58:59 +0000 (14:58 +1000)]
add qmetaobjectbuilder to qtbase.

    Use the QMetaObjectBuilder code from declarative and add it to libQtCore.

    Consolidating various QMetaObjectBuilder implimentations to avoid
    code duplications in those modules.

    This is currently still a private API only.

Change-Id: Ie363b4fd769c41efbb3caa7fb1d6f77af13c3c9c
Reviewed-on: http://codereview.qt-project.org/6287
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
13 years agoRemove redundant logic from dbus test .pro files.
Jason McDonald [Tue, 11 Oct 2011 01:47:50 +0000 (11:47 +1000)]
Remove redundant logic from dbus test .pro files.

There was logic in .pro files for the dbus tests to omit the body of
each test if dbus was not available in the Qt build.  This was all
redundant however, because tests/auto/auto.pro already excluded all dbus
tests if dbus was not available in the Qt build.

Change-Id: Iaea06e38622e5227daec4d2e08106c2da3fb4013
Reviewed-on: http://codereview.qt-project.org/6372
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemoved outdated config.profiles
Rohan McGovern [Tue, 11 Oct 2011 04:06:08 +0000 (14:06 +1000)]
Removed outdated config.profiles

These harmattan and symbian build scripts are very outdated for Qt5, and
will not work.  Get rid of them.

Change-Id: Id050491b3975d138599b548367abf23356516457
Reviewed-on: http://codereview.qt-project.org/6383
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoUpdate V8
Aaron Kennedy [Tue, 11 Oct 2011 04:27:48 +0000 (14:27 +1000)]
Update V8

Change-Id: I359ec3f57a120ebd02d03c56d0944397b5407ed8
Reviewed-on: http://codereview.qt-project.org/6386
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

13 years agoFixed CONFIG+=declarative_debug with QT+=declarative-private
Rohan McGovern [Tue, 11 Oct 2011 02:55:58 +0000 (12:55 +1000)]
Fixed CONFIG+=declarative_debug with QT+=declarative-private

QT+=<foo>-private is supposed to be a superset of QT+=<foo>.
declarative_debug.prf was subtly breaking this for the
declarative-private case.

Change-Id: Ica082b03d19e702434b90e0f8b2c1fa6b592babb
Reviewed-on: http://codereview.qt-project.org/6373
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoRemove duplicate check in qtextcontrol cursorMoveKeyEvent()
Kent Hansen [Wed, 5 Oct 2011 10:10:31 +0000 (12:10 +0200)]
Remove duplicate check in qtextcontrol cursorMoveKeyEvent()

No reason to check for QKeySequence::MoveToPreviousLine twice.

Task-number: QTBUG-20482
Change-Id: Ib1504be33908fa7cbc27226060f94794c454681c
Reviewed-on: http://codereview.qt-project.org/6050
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoQtBase: Move idc to Active Qt.
Friedemann Kleint [Mon, 10 Oct 2011 13:57:27 +0000 (15:57 +0200)]
QtBase: Move idc to Active Qt.

Remove include path to Active Qt from qt.prf.

Change-Id: I476152ce56e47b573f5c835ec1347e772c4e9c3e
Reviewed-on: http://codereview.qt-project.org/6355
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

13 years agoMake all uses of QBasicAtomicInt and Pointer use load() and store()
Bradley T. Hughes [Mon, 10 Oct 2011 12:41:37 +0000 (14:41 +0200)]
Make all uses of QBasicAtomicInt and Pointer use load() and store()

Change Ie3271abd1728af599f9ab17c6f4868e475f17bb6 didn't build on Mac in
debug mode. This commit fixes the build.

Change-Id: I925af83ea577228b60679af804aa7875a779ec3f
Reviewed-on: http://codereview.qt-project.org/6331
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoRemoved src/gui/opengl/qopenglcolormap.*
Samuel Rødal [Mon, 10 Oct 2011 12:16:23 +0000 (14:16 +0200)]
Removed src/gui/opengl/qopenglcolormap.*

The QGLColormap API was used by QGLWidget, not very relevant in the Qt 5
core API.

Change-Id: I3c75ac09cbc292e707aea62759c09277f834de8d
Reviewed-on: http://codereview.qt-project.org/6333
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFixed some doc errors in QOpenGLFramebufferObject.
Samuel Rødal [Mon, 10 Oct 2011 12:56:30 +0000 (14:56 +0200)]
Fixed some doc errors in QOpenGLFramebufferObject.

Change-Id: Ic132bc31f87900a492a80767aa247c71c48c4a10
Reviewed-on: http://codereview.qt-project.org/6334
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoFixed missing snippets for QOpenGLShaderProgram.
Samuel Rødal [Mon, 10 Oct 2011 12:15:13 +0000 (14:15 +0200)]
Fixed missing snippets for QOpenGLShaderProgram.

Change-Id: Ie44edb3379f6fef4c4c8b69bb5e36fc19154ab26
Reviewed-on: http://codereview.qt-project.org/6332
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoQUnifiedTimer: Add callback for timer ticks. Used for profiling
Christiaan Janssen [Fri, 7 Oct 2011 12:58:50 +0000 (14:58 +0200)]
QUnifiedTimer: Add callback for timer ticks. Used for profiling

Change-Id: Ia7cf823dee7f0b491db2f041d29cdfc0e385f18e
Reviewed-on: http://codereview.qt-project.org/6253
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAdd some snippets from qtdoc.
Casper van Donderen [Fri, 7 Oct 2011 12:00:38 +0000 (14:00 +0200)]
Add some snippets from qtdoc.

These snippets where in qtdoc before, to modularize the documentation
they move to qtbase instead.

Change-Id: Icf430b6d0a0b26c9466b7df4d51721b53e5239cf
Reviewed-on: http://codereview.qt-project.org/6237
Sanity-Review: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

13 years agoUse freetype font engine on Windows
Olli Werwolff [Fri, 7 Oct 2011 08:00:04 +0000 (10:00 +0200)]
Use freetype font engine on Windows

As windows' fontdatabases also uses functionalities from
qbasicunixfontdatabase it was renamed to qbasicfontdatabase. But instead
of iterating over the font directories' files it uses system calls to
obtain the list of fonts and uses registry values to find the according
filenames to add.
The native font engine was still kept. It can be activated by adding
fontengine=native as platformargument.

Change-Id: I7197bed5d18b8a33d4aa97ce91bfa1cd281b80ea
Reviewed-on: http://codereview.qt-project.org/5839
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Sanity-Review: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>

13 years agoEasier shader debugging
Jani Uusi-Rantala [Sun, 9 Oct 2011 18:06:49 +0000 (21:06 +0300)]
Easier shader debugging

- Dumps out also the source code of the failed shader if available

Change-Id: I9ae80e6a6749446c5ff54db1bc324cc7411a81a7
Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6269
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoEnable using the new Qt::ScreenOrientation enum as flags
Jani Uusi-Rantala [Sat, 8 Oct 2011 16:45:22 +0000 (19:45 +0300)]
Enable using the new Qt::ScreenOrientation enum as flags

Going to be useful later on in multiple places...

- Respecified Qt::ScreenOrientation as bit values
- Added Qt::ScreenOrientations QFlags definitions

Change-Id: Ib7648d23de79ea5f88d617015bc98efcf903a8f3
Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6268
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoMinor build fix for newer XCB versions
Jani Uusi-Rantala [Sat, 8 Oct 2011 11:13:51 +0000 (14:13 +0300)]
Minor build fix for newer XCB versions

- Defines XCB_WM_STATE_WITHDRAWN as XCB_ICCCM_WM_STATE_WITHDRAWN if necessary

Change-Id: I4212a0e1d7f14ac6695d23d6586dd97f898d3f2b
Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6267
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
13 years agoClean-up a macro for Cocoa
Morten Sorvig [Thu, 29 Sep 2011 12:29:05 +0000 (14:29 +0200)]
Clean-up a macro for Cocoa

Remove the usage of Q_MAC_USE_COCOA and Carbon code paths.

Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112
Reviewed-on: http://codereview.qt-project.org/5100
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>

13 years agoupdate QmlTest option usage help
Charles Yin [Mon, 10 Oct 2011 01:33:05 +0000 (11:33 +1000)]
update QmlTest option usage help

Change-Id: I8ccd49bcaac126af2bad2382d481857f1e48c18b
Reviewed-on: http://codereview.qt-project.org/6274
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

13 years agoMake sure window state is synced back to Qt from the XCB plugin.
Samuel Rødal [Fri, 7 Oct 2011 18:22:46 +0000 (20:22 +0200)]
Make sure window state is synced back to Qt from the XCB plugin.

We should properly react to the property notify events.

Task-number: QTBUG-21856
Change-Id: I0d2aa90b7d8da3b96acf4d88684b0200de7d7413
Reviewed-on: http://codereview.qt-project.org/6266
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFixed potential issue in XCB plugin.
Samuel Rødal [Fri, 7 Oct 2011 18:21:41 +0000 (20:21 +0200)]
Fixed potential issue in XCB plugin.

Use the actual atom instead of the enum value of the atom when
signaling that the event loop should exit.

Change-Id: Ib98c6a46cadcecc727b28411b4c0c12c434ea828
Reviewed-on: http://codereview.qt-project.org/6265
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdded Orientation API to QScreen and QWindow.
Samuel Rødal [Tue, 4 Oct 2011 11:11:30 +0000 (13:11 +0200)]
Added Orientation API to QScreen and QWindow.

QScreen now has a primary and current orientation, and a QWindow can set
its orientation as well. The current screen orientation is just a hint
to the application.

Change-Id: I4635982cfac2d16634d4edd5c6ab78e9d0ac55a4
Reviewed-on: http://codereview.qt-project.org/5988
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix QMouse/Wheel/TouchEvent::modifiers with the XCB back-end
Simon Hausmann [Fri, 7 Oct 2011 12:54:17 +0000 (14:54 +0200)]
Fix QMouse/Wheel/TouchEvent::modifiers with the XCB back-end

The modifiers are provided by X and need to be propagated through the
QWindowSystemInterface.

Change-Id: I127d0b6e9918b558ca15d9302c4cc0cbd94eb757
Reviewed-on: http://codereview.qt-project.org/6244
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Sanity-Review: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

13 years agoFixed crash due to uninitialized pointer in OpenGL texture glyph cache.
Samuel Rødal [Thu, 6 Oct 2011 10:50:22 +0000 (12:50 +0200)]
Fixed crash due to uninitialized pointer in OpenGL texture glyph cache.

Change-Id: I384f82f1549a81e19566484e12c75ce8df1f314f
Reviewed-on: http://codereview.qt-project.org/6149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoqwindowsstyle: Remove duplicate flag in mask
Kent Hansen [Wed, 5 Oct 2011 10:27:44 +0000 (12:27 +0200)]
qwindowsstyle: Remove duplicate flag in mask

Adding State_Sunken once should be enough for everyone.

Task-number: QTBUG-20482
Change-Id: Ic5c1bf47283d9c344eda41c766749d4106a8da67
Reviewed-on: http://codereview.qt-project.org/6051
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
13 years agoImprove QMenu test coverage for Mac and WinCE.
Jason McDonald [Fri, 7 Oct 2011 01:48:47 +0000 (11:48 +1000)]
Improve QMenu test coverage for Mac and WinCE.

Add a couple of previously excluded lines of code that should work for
all platforms.

Change-Id: I5f0b5365060a91cb708a3143b28f7de703fc419e
Reviewed-on: http://codereview.qt-project.org/6196
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove redundant qWarning's.
Jason McDonald [Fri, 7 Oct 2011 01:42:28 +0000 (11:42 +1000)]
Remove redundant qWarning's.

The removed warnings just repeat information that is already in the
QSKIP's that immediately follow the warnings.

Change-Id: Id13158487e8075aab8a8f48955303edde3f4af63
Reviewed-on: http://codereview.qt-project.org/6194
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove redundant define.
Jason McDonald [Fri, 7 Oct 2011 01:37:33 +0000 (11:37 +1000)]
Remove redundant define.

Q_CHECK_PAINTEVENTS was guaranteed to be defined prior to the code that
was conditional on it being undefined.

Change-Id: I8b48a2c6bff997de7d0e3f640203308718dd865b
Reviewed-on: http://codereview.qt-project.org/6193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoComment out test that is always skipped.
Jason McDonald [Fri, 7 Oct 2011 01:34:37 +0000 (11:34 +1000)]
Comment out test that is always skipped.

Change-Id: I0af7a5c6708d09ce9b63b7c177d31e0631da43cd
Reviewed-on: http://codereview.qt-project.org/6192
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove dead code and empty test functions.
Jason McDonald [Fri, 7 Oct 2011 01:29:44 +0000 (11:29 +1000)]
Remove dead code and empty test functions.

Change-Id: Iaf8ac514d814c9321f8dcd09b2bf3331f87154e6
Reviewed-on: http://codereview.qt-project.org/6191
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFail test in preference to calling qFatal.
Jason McDonald [Fri, 7 Oct 2011 01:26:37 +0000 (11:26 +1000)]
Fail test in preference to calling qFatal.

Calling qFatal may result in test output not being well-formed.

Change-Id: Ia16bade4d3311485c6ba4dd23d5624d18b192b71
Reviewed-on: http://codereview.qt-project.org/6190
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoNo need to return after QSKIP.
Jason McDonald [Fri, 7 Oct 2011 00:55:06 +0000 (10:55 +1000)]
No need to return after QSKIP.

QSKIP already causes the test function that calls it to return, so the
returns removed by this commit were unreachable.

Change-Id: I1fa2f3a3271927d8a600b02d8b31bd81db9146b1
Reviewed-on: http://codereview.qt-project.org/6188
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAvoid using QSKIP in lieu of compile-time checks
Jason McDonald [Thu, 6 Oct 2011 08:56:31 +0000 (18:56 +1000)]
Avoid using QSKIP in lieu of compile-time checks

QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe.  If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.

Task-number: QTQAINFRA-278

Change-Id: I95feba3edbfa092c0ef4d85bb8c6877bd6be698e
Reviewed-on: http://codereview.qt-project.org/6128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete test functions.
Jason McDonald [Thu, 6 Oct 2011 06:59:22 +0000 (16:59 +1000)]
Remove obsolete test functions.

Commit 2cbeb6c08cb7c79d6126f75c2cbc470679d671e1 made these test
functions obsolete.

Change-Id: I89a379d7228584a83e9d7674060081f4201f561c
Reviewed-on: http://codereview.qt-project.org/6113
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoEliminate needless QSKIPs in qaccessibility test.
Jason McDonald [Thu, 6 Oct 2011 03:48:18 +0000 (13:48 +1000)]
Eliminate needless QSKIPs in qaccessibility test.

On Unix the table1 interface was replaced by the table2 interface, while
table1 is still used on other platforms.  This commit changes the test
so that only the applicable test functions are built and run, where
previously both sets of tests were built and one set would always skip.

Change-Id: I5a785fb88fcbf4e5896e1fdb80c7c0a659597e34
Reviewed-on: http://codereview.qt-project.org/6097
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDon't default to XCB if it is not enabled.
Lincoln Ramsay [Tue, 4 Oct 2011 03:28:44 +0000 (13:28 +1000)]
Don't default to XCB if it is not enabled.

Default to wayland unless it's not enabled.
Default to minimal otherwise.

Change-Id: I0fa523eae395821a7cb0cabbb27ca073e594246f
Reviewed-on: http://codereview.qt-project.org/5945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix QFont::defaultFamily() in the new QPA world.
Pierre Rossi [Wed, 5 Oct 2011 15:10:28 +0000 (17:10 +0200)]
Fix QFont::defaultFamily() in the new QPA world.

This is so that the results of LayoutTests in WebKit are
more in line with what things were like in Qt 4.8.

Change-Id: I25962e03bd8e0316cb303c0d94c25ac4e73ea9a8
Reviewed-on: http://codereview.qt-project.org/6162
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoFix the QNetworkConnectionManagerPrivate initialisation code.
Thiago Macieira [Tue, 5 Jul 2011 22:06:15 +0000 (00:06 +0200)]
Fix the QNetworkConnectionManagerPrivate initialisation code.

The current code was meant to be a thread-safe initialisation that
also ran a couple of extra steps. But it wasn't. While it's ok to call
qAddPostRoutine(), the call to updateConfigurations() was
thread-unsafe. It is possible that another thread got the pointer to
the Private before updateConfigurations() finished.

So instead protect the initialisation with a mutex.

It's possible that the value of the pointer becomes visible to
other processors before the other contained values, so use
atomics here.

To call qAddPostRoutine safely from the main thread, use the trick
of deleteLater() (which is thread-safe) in another thread connecting
to a slot.

Change-Id: If9bab88138755df95a791f34b0be8684207979d7
Reviewed-on: http://codereview.qt-project.org/5028
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoRemoved some dead code from QWidgetLineControl
Pekka Vuorela [Fri, 30 Sep 2011 13:50:10 +0000 (16:50 +0300)]
Removed some dead code from QWidgetLineControl

There was a big processEvents() method which was actually getting
called for a single type of events.

Change-Id: I66ac70c7ac6e2f9136b24541d42a4185f8797583
Reviewed-on: http://codereview.qt-project.org/6132
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>
13 years agofix QChar::isSpace() to handle codepoint U+0085
Konstantin Ritt [Thu, 6 Oct 2011 12:56:24 +0000 (14:56 +0200)]
fix QChar::isSpace() to handle codepoint U+0085

according to the Unicode specs, code point U+0085 should be treated
like a white space character (an exceptional Cc one)

Change-Id: Ib17ae0c4d3cdafe667cafa38b645138ef24c238c
Merge-request: 32
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6158
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoFix incorrect QFileInfo permissions on windows
Shane Kearns [Thu, 6 Oct 2011 12:46:30 +0000 (13:46 +0100)]
Fix incorrect QFileInfo permissions on windows

Requesting the write permission marked the read permission as known
without having retrieved it. A subsequent request for read permission
would return false.

Task-Number: QTBUG-20714
Reviewed-By: mread
(cherry picked from commit bf69c7e0af67ec877da4fee244386e538fa1c01d)

Change-Id: I74fd118fcdd3b222098eda2718823a36931424a1
Reviewed-on: http://codereview.qt-project.org/6159
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
13 years agoMerge fixes for QDir::operator==
Shane Kearns [Tue, 6 Sep 2011 15:43:29 +0000 (16:43 +0100)]
Merge fixes for QDir::operator==

There were two fixes in 4.8 which each fixed a part of the problem.
Comparing canonical paths is more correct, but is only possible where
both directories exist. If neither directory exists, then compare
absolute paths instead.
Changed a regression test, because /tmp is a symbolic link on MacOS.
I.E. "/tmp/.." is canonically "/private" and not "/" as expected.

Task-Number: QTBUG-20495
Reviewed-By: joao
(cherry-picked from ad35d25e78c8252a72108a4ba931934047c4707e)

Change-Id: Ia4986e8337f0e512e1a3398a5a4dd36e62680b9c
Reviewed-on: http://codereview.qt-project.org/5813
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
13 years agoMake QLineEdit unit test pass again
Pekka Vuorela [Wed, 5 Oct 2011 11:39:57 +0000 (14:39 +0300)]
Make QLineEdit unit test pass again

Widget failed to update cursor position if selection remained the same, but
changed direction, and did not emit selectionChanged if change resulted
from input method event.

Change-Id: I6a4ae48d41efa5e126980749f89982f92e3ec499
Reviewed-on: http://codereview.qt-project.org/6131
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>
13 years agoQHostInfo: fix a race condition under CE
Konstantin Ritt [Thu, 6 Oct 2011 10:09:14 +0000 (12:09 +0200)]
QHostInfo: fix a race condition under CE

Merge-request: 1339
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Change-Id: Id1f977ad8f746ac848c355880cac688e256721d8
Reviewed-on: http://codereview.qt-project.org/6145
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoCreate auto test for http HEAD request
Shane Kearns [Mon, 3 Oct 2011 15:29:43 +0000 (16:29 +0100)]
Create auto test for http HEAD request

This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.

Task-Number: QT-5304
Change-Id: I0d98bd1f1125ffd49d9f3c859a51b2aaee95379a
Reviewed-By: Martin Petersson
Reviewed-on: http://codereview.qt-project.org/6033
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
13 years agoFix QDir::operator==(const QDir &) const
João Abecasis [Thu, 11 Aug 2011 13:49:37 +0000 (15:49 +0200)]
Fix QDir::operator==(const QDir &) const

We can't rely on absolute paths when comparing directories for equality
as these don't take into account symbolic links and may also bypass ../
and ./ simplification.

Instead, canonical paths must be computed and can then be compared
according to the case sensitivity rules for the platform or file engine,
as is done in QFileInfo.

Task-number: QTBUG-20495
Reviewed-by: Prasanth Ullattil
(cherry-picked from dcee6e1371d899eb79717b8e3f3eec08b765db82)

Change-Id: Ib5f2a6ee11311c55782ea5dd0e9c3b45f9231686
Reviewed-on: http://codereview.qt-project.org/5812
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
13 years agoCompile on 10.6
Morten Sorvig [Tue, 4 Oct 2011 12:36:26 +0000 (14:36 +0200)]
Compile on 10.6

Change-Id: Ifce1ab6ced179f68a3d08162940e9092b90beb11
Reviewed-on: http://codereview.qt-project.org/6124
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoRemove duplicate check in utf endian detection
Kent Hansen [Wed, 5 Oct 2011 09:53:06 +0000 (11:53 +0200)]
Remove duplicate check in utf endian detection

This was excessive paranoia.

Task-number: QTBUG-20482
Change-Id: Ia0c76651773e12f25ec5d62675d6f317b8d2df13
Reviewed-on: http://codereview.qt-project.org/6045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix typo in qbezier shift implementation
Kent Hansen [Wed, 5 Oct 2011 10:04:34 +0000 (12:04 +0200)]
Fix typo in qbezier shift implementation

Multiplying by zero was not the intention.

Task-number: QTBUG-20482
Change-Id: I3c4dfd69da4d98ed65f318d1fa0c3cf827017688
Reviewed-on: http://codereview.qt-project.org/6048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoImproved logical and physical DPI APIs.
Samuel Rødal [Fri, 30 Sep 2011 12:25:43 +0000 (14:25 +0200)]
Improved logical and physical DPI APIs.

Made physicalSize() return QSizeF instead, to prevent rounding errors.
Added logicalSize() as the base to compute font pixel sizes instead, and
added convenience functions in QScreen to access the logical and
physical sizes and DPI metrics.

Task-number: QTBUG-21736
Task-number: QTBUG-21737
Change-Id: Ic705dc98eb3632617659e65a0c9a552673dc0c65
Reviewed-on: http://codereview.qt-project.org/5888
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoRemove redundant assignment in QXmlStreamReader
Kent Hansen [Wed, 5 Oct 2011 10:52:16 +0000 (12:52 +0200)]
Remove redundant assignment in QXmlStreamReader

Setting tos to 0 once should be enough for everyone.

Task-number: QTBUG-20482
Change-Id: I7aa46ff5d4ed8064e3fb2cebc3dfcaa4e73741f8
Reviewed-on: http://codereview.qt-project.org/6053
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoFix unreachable QSKIP in QMenu autotest
Jason McDonald [Thu, 6 Oct 2011 00:57:07 +0000 (10:57 +1000)]
Fix unreachable QSKIP in QMenu autotest

The QSKIP is only reachable on Mac, so only compile it for Mac.

Change-Id: I268e87829e01755051f81cdaf856d936b04b3d49
Reviewed-on: http://codereview.qt-project.org/6091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove formatting of QMenu autotest
Jason McDonald [Thu, 6 Oct 2011 00:51:56 +0000 (10:51 +1000)]
Improve formatting of QMenu autotest

Remove literal tabs and empty functions.  Bring layout closer to Qt
coding guidelines.

Change-Id: I4f1b214c69ee9bfe46c3275eb224e38df15e8744
Reviewed-on: http://codereview.qt-project.org/6090
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoTidy qsqldatabase autotest
Jason McDonald [Wed, 5 Oct 2011 07:15:42 +0000 (17:15 +1000)]
Tidy qsqldatabase autotest

Remove unused macro and remove redundant returns after calls to QSKIP.

Change-Id: Ie333801cbec6c3123931f2fedbcd8902cab69a2e
Reviewed-on: http://codereview.qt-project.org/6021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoLogic does not match error message.
Lincoln Ramsay [Thu, 6 Oct 2011 04:04:57 +0000 (14:04 +1000)]
Logic does not match error message.

Passing -no-xcb or -no-wayland was enough to get a build with neither
but the error message says you need to pass both. Fix the logic.

Change-Id: I2d554d371b603e7df7bc07e1b4d5271ba31243f0
Reviewed-on: http://codereview.qt-project.org/6099
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove code to selectively run test functions.
Jason McDonald [Wed, 5 Oct 2011 06:23:06 +0000 (16:23 +1000)]
Remove code to selectively run test functions.

QTestLib already makes a superior version of this functionality
available to all tests, without the need to recompile.  Each qtestlib
test program can be passed, via the command line, a list of test
functions and test data tags to be executed instead of executing all
test functions.

Change-Id: I1b54fc70a0c58a17209817afabfb953b5748dac4
Reviewed-on: http://codereview.qt-project.org/6015
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAvoid QSKIP in lieu of compile-time checks.
Jason McDonald [Wed, 5 Oct 2011 05:28:42 +0000 (15:28 +1000)]
Avoid QSKIP in lieu of compile-time checks.

Change compiler autotest to omit inapplicable functions at compile-time
in preference to skipping at run-time.

Change-Id: I8a221cadbb7b59d926754862332c0665673b8a56
Reviewed-on: http://codereview.qt-project.org/6011
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAvoid QSKIP in lieu of compile-time check.
Jason McDonald [Wed, 5 Oct 2011 05:10:37 +0000 (15:10 +1000)]
Avoid QSKIP in lieu of compile-time check.

Omit focusColors test function at compile-time in preference to
skipping at run-time.  Also removed commented out code.

Change-Id: Ib8955656f5a43b30df95b4c9865e52902dbd6b1e
Reviewed-on: http://codereview.qt-project.org/6010
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoTidy QActionGroup autotest.
Jason McDonald [Wed, 5 Oct 2011 04:43:11 +0000 (14:43 +1000)]
Tidy QActionGroup autotest.

Remove empty constructor/destructor.  Remove dropDownDeleted test
function which has been entirely skipped since before Qt 4.0, is
obviously incomplete (it attempts to use a QComboBox that does not
exist) and provides no statement of intention that might allow the
incompleteness to be addressed.

Change-Id: I4975b6d5a5dde1e58dab1dd393be92eddeb4c9f8
Reviewed-on: http://codereview.qt-project.org/6009
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDon't build qwindowsurface autotest on Mac OS.
Jason McDonald [Tue, 4 Oct 2011 06:58:55 +0000 (16:58 +1000)]
Don't build qwindowsurface autotest on Mac OS.

The test was a no-op on Mac OS. It's better to avoid building or running
it on Mac OS, rather than spending time compiling and running a test
that does nothing on that platform.

Change-Id: I4aa579036788e404f8a6a8f1a80acd32338fb3cd
Reviewed-on: http://codereview.qt-project.org/5958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoA QPA build on Linux requires xcb or wayland
Lincoln Ramsay [Wed, 5 Oct 2011 03:32:01 +0000 (13:32 +1000)]
A QPA build on Linux requires xcb or wayland

Require the user to pass -no-xcb and -no-wayland in order to produce
a build that has only the minimal plugin available.

This prevents "useless" builds from being accidentally created.

Change-Id: If2f7f516a52b75998f3ae7bf802f89f93f6e8218
Reviewed-on: http://codereview.qt-project.org/6005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoIf -xcb is passed and we can't enable xcb, die
Lincoln Ramsay [Tue, 4 Oct 2011 03:20:42 +0000 (13:20 +1000)]
If -xcb is passed and we can't enable xcb, die

Needed to resolve issue QTBUG-21486

Change-Id: I5493cfa73f0433fda60fb0dd850380021e13b928
Reviewed-on: http://codereview.qt-project.org/5944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoShow the -xcb default properly.
Lincoln Ramsay [Wed, 5 Oct 2011 03:18:59 +0000 (13:18 +1000)]
Show the -xcb default properly.

The * was not appearing against the default for the -xcb switch because
of a spelling mistake.

Change-Id: I3491cc9772d02179711b0d474db7ab2ef2398e88
Reviewed-on: http://codereview.qt-project.org/6003
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
13 years agoAdd QTest::keyRelease() accepting a Qt::Key value
Martin Jones [Wed, 5 Oct 2011 23:28:24 +0000 (09:28 +1000)]
Add QTest::keyRelease() accepting a Qt::Key value

Change-Id: Id7943820a71472ab1e3c81ea76701738d7600815
Reviewed-on: http://codereview.qt-project.org/6085
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAccessible: remove calls with virtual int children in test.
Frederik Gladhorn [Wed, 5 Oct 2011 07:40:04 +0000 (09:40 +0200)]
Accessible: remove calls with virtual int children in test.

Change-Id: I08ba2fab8ed17b75b971c86cb085af4d3828ec8a
Reviewed-on: http://codereview.qt-project.org/6025
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoClean up accessible spin box test.
Frederik Gladhorn [Tue, 4 Oct 2011 14:46:45 +0000 (16:46 +0200)]
Clean up accessible spin box test.

Change-Id: Ic56f5a99ee57a23d43a81d66af82324ecba8964c
Reviewed-on: http://codereview.qt-project.org/5994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoRemove empty test function.
Frederik Gladhorn [Tue, 4 Oct 2011 14:48:23 +0000 (16:48 +0200)]
Remove empty test function.

Change-Id: I02b688a25ab77a2df2da8beb57eb94a7432e537d
Reviewed-on: http://codereview.qt-project.org/5995
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoUse child/parent function in QAccessibleWidget and test.
Frederik Gladhorn [Tue, 4 Oct 2011 12:20:05 +0000 (14:20 +0200)]
Use child/parent function in QAccessibleWidget and test.

This also uncovered a missing implementation of child for
dock widgets.

Change-Id: Iac4c5a51d4626769af11b277a9a345e1e31dc490
Reviewed-on: http://codereview.qt-project.org/5987
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoRemove obsolete QMatrix test function.
Jason McDonald [Tue, 4 Oct 2011 07:19:52 +0000 (17:19 +1000)]
Remove obsolete QMatrix test function.

The operator tested by this function (QMatrix * QRect) has not existed
since Qt 2.x.

Change-Id: Id09154de2bdda70c0fe342fe78b82709953e2b56
Reviewed-on: http://codereview.qt-project.org/5965
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDon't build qitemview autotest on IRIX.
Jason McDonald [Tue, 4 Oct 2011 06:24:54 +0000 (16:24 +1000)]
Don't build qitemview autotest on IRIX.

The test was being skipped one test function at a time on IRIX.  It's
better to avoid building or running it, rather than spending time
running a test that does nothing on that platform.

This commit also turns a silent skip on other platforms into an explicit
QSKIP to make it more obvious that there's an unfixed TODO there.

Change-Id: I7cae4f0f2eaebf5977a781b2ce15d1e71ef13b36
Reviewed-on: http://codereview.qt-project.org/5957
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemoved disabled test data in QDir autotest.
Jason McDonald [Tue, 4 Oct 2011 06:03:02 +0000 (16:03 +1000)]
Removed disabled test data in QDir autotest.

The unprintablenames test was designed to prevent an old failure in
QDir from returning, but the test can't be run reliably on some
file-systems and certainly isn't going to achieve its goal when it's
commented out.

Change-Id: Ib4cb965d59c291ab2436130b87e865ac21b9b483
Reviewed-on: http://codereview.qt-project.org/5956
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove last remnants of Maemo 5 from autotests
Jason McDonald [Tue, 4 Oct 2011 04:48:26 +0000 (14:48 +1000)]
Remove last remnants of Maemo 5 from autotests

Change-Id: I69bc9a3fc5ec4f7f9b927919ca7627a8a1e61700
Reviewed-on: http://codereview.qt-project.org/5951
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove last remnants of symbian in autotests.
Jason McDonald [Tue, 4 Oct 2011 04:22:40 +0000 (14:22 +1000)]
Remove last remnants of symbian in autotests.

Change-Id: I91489614653cfe4bcf16b723976e33531402a464
Reviewed-on: http://codereview.qt-project.org/5948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoQNAM - fix poor performance of HEAD request with authentication
Shane Kearns [Mon, 3 Oct 2011 15:27:34 +0000 (16:27 +0100)]
QNAM - fix poor performance of HEAD request with authentication

QHttpNetworkReply was waiting for a body to be sent for 401 and 407
responses, whereas with a HTTP HEAD request, there will be no body.

This delayed the authentication signal until after the http channel
is closed by the server after a timeout. For example with the server
used for autotesting, the authentication signal is delayed 15 seconds.

When the server has a very long timeout, the authentication signal may
not be emitted at all.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
(cherry picked from commit 8610ee14b8636641651a8ba6040cca16c4141ed6)

Change-Id: Ie4ce6c598df86ce59910f793fd5ae7c1ccf39f9d
Reviewed-on: http://codereview.qt-project.org/6032
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
13 years agoQtGui: Add command line arguments to the platform plugin.
Friedemann Kleint [Wed, 5 Oct 2011 09:08:32 +0000 (11:08 +0200)]
QtGui: Add command line arguments to the platform plugin.

Set -platformargument foo[=bar] as a dynamic property
on the native interface.

Change-Id: Ica8b25478da0ce9508b90370f15812fd11ff5d13
Reviewed-on: http://codereview.qt-project.org/6031
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoDon't use implicit QAtomic* casts in QFreeList
Bradley T. Hughes [Thu, 29 Sep 2011 09:45:01 +0000 (11:45 +0200)]
Don't use implicit QAtomic* casts in QFreeList

Pair the _next.testAndSetRelease() call in QFreeList<T>::release() with
_next.loadAcquire(), to ensure that the update to the bucket
being released is properly fenced.

QFreeList<T>:next() does not need a release fence, only an acquire fence,
which is placed on the memory bucket address load.

Change-Id: Ib5b9d6ef6107f87aa8e3ea2dd3a7f9116c75da70
Reviewed-by: Thiago Macieira
Reviewed-on: http://codereview.qt-project.org/5802
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
13 years agoFix boolean logic issues in qcoreapplication_win
Kent Hansen [Wed, 5 Oct 2011 09:58:34 +0000 (11:58 +0200)]
Fix boolean logic issues in qcoreapplication_win

Task-number: QTBUG-20482

Change-Id: Iadbde59953a86d5f74d68c7cdc36b7706525612c
Reviewed-on: http://codereview.qt-project.org/6046
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoRemove duplicate check for glDeleteProgram
Kent Hansen [Wed, 5 Oct 2011 10:31:14 +0000 (12:31 +0200)]
Remove duplicate check for glDeleteProgram

It's already checked for earlier in the expression.

Task-number: QTBUG-20482
Change-Id: Iad7e8fa80aab98d47d90ecb0c497245450cdfa40
Reviewed-on: http://codereview.qt-project.org/6052
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAdd missing Q_OBJECT macro to GoToStateTransition
Kent Hansen [Wed, 5 Oct 2011 09:33:01 +0000 (11:33 +0200)]
Add missing Q_OBJECT macro to GoToStateTransition

The missing macro caused qFindChild() to return any
QAbstractTransition.

Task-number: QTBUG-21813
Change-Id: I80507aa86c8c32d7fa59a1b5ae551043f5f90315
Reviewed-on: http://codereview.qt-project.org/6044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoAdd font family alias resolving to QPA
Jiang Jiang [Tue, 4 Oct 2011 12:52:13 +0000 (14:52 +0200)]
Add font family alias resolving to QPA

By default it doesn't do anything special, but for fontconfig font db
it will do some tricks to convert alias like serif to actualy font
family names like Times.

Change-Id: I73058d187a5422e6f93bc1b728cecdc0250d5e1e
Reviewed-on: http://codereview.qt-project.org/5984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
13 years agoAdded QWindow::isActive() and focus in / out events.
Samuel Rødal [Thu, 29 Sep 2011 16:02:54 +0000 (18:02 +0200)]
Added QWindow::isActive() and focus in / out events.

Renamed QGuiApplication::activeWindow() to
QGuiApplication::focusWindow(), implemented QWindow::isActive() as a
style hint, and added focus in / out events.

Change-Id: I71866e76c5a817def3e17bcc20a4fc32081a0e7a
Reviewed-on: http://codereview.qt-project.org/5811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoAvoid using QSKIP in lieu of compile-time checks
Jason McDonald [Tue, 4 Oct 2011 03:23:23 +0000 (13:23 +1000)]
Avoid using QSKIP in lieu of compile-time checks

QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe.  If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.

Task-number: QTQAINFRA-278

Change-Id: I582732e3dd657df834f9a98fd52d7ee368f2f29b
Reviewed-on: http://codereview.qt-project.org/5946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove Symbian-only test function.
Jason McDonald [Tue, 4 Oct 2011 02:14:01 +0000 (12:14 +1000)]
Remove Symbian-only test function.

Change-Id: I817c234a6104a072f131c17e9492c68d79ca5f8d
Reviewed-on: http://codereview.qt-project.org/5943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAvoid using QSKIP in lieu of compile-time checks
Jason McDonald [Tue, 4 Oct 2011 01:51:31 +0000 (11:51 +1000)]
Avoid using QSKIP in lieu of compile-time checks

QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe.  If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.

Task-number: QTQAINFRA-278

Change-Id: Ib2025339422749cf216e87ac414a3056250bf8f9
Reviewed-on: http://codereview.qt-project.org/5942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoCocoa: Fix a variable shadowing issue that caused a crash on mac
Zeno Albisser [Tue, 4 Oct 2011 16:16:34 +0000 (18:16 +0200)]
Cocoa: Fix a variable shadowing issue that caused a crash on mac

Change-Id: I2d5ceb9502c769b5a585cdc6f1053168dfadbf12
Reviewed-on: http://codereview.qt-project.org/6000
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
13 years agoDeclarative: Fix linking of the testlib plugin (Windows).
Friedemann Kleint [Tue, 4 Oct 2011 13:33:34 +0000 (15:33 +0200)]
Declarative: Fix linking of the testlib plugin (Windows).

qtdeclarative/src/imports/testlib uses the exported variable
QTest::printAvailableFunctions.

As it is a plugin, it has only QT_DLL defined and not QT_SHARED
and thus sees Q_TESTLIB_EXPORT=''.

Change-Id: I34646e920a812fb907b60e0c4c9399499d689a01
Reviewed-on: http://codereview.qt-project.org/5990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoImplement showFullScreen, showNormal, and showMaximized/Minimized in QWindow.
Alexis Menard [Tue, 4 Oct 2011 13:09:34 +0000 (15:09 +0200)]
Implement showFullScreen, showNormal, and showMaximized/Minimized in QWindow.

The implementation was just missing to call the proper APIs.

Merge-request: 65
Change-Id: I52f7825360bf55d37762421562484af684bf2dc8
Reviewed-on: http://codereview.qt-project.org/5986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agomake it possible to disable wayland support
Oswald Buddenhagen [Wed, 21 Sep 2011 09:11:14 +0000 (11:11 +0200)]
make it possible to disable wayland support

Change-Id: I8640b5fdc0f2a20d7349f7a43e61e6b37f59d3a0
Reviewed-on: http://codereview.qt-project.org/5334
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoWindows/configure.exe: Build V8 by default.
Friedemann Kleint [Thu, 29 Sep 2011 14:53:43 +0000 (16:53 +0200)]
Windows/configure.exe: Build V8 by default.

Change-Id: I01f31f683fcac322c2a8bec313a48057939ebeb0
Reviewed-on: http://codereview.qt-project.org/5809
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoCocoa: Add env variable for disabling foreground.
Morten Sorvig [Tue, 4 Oct 2011 07:54:38 +0000 (09:54 +0200)]
Cocoa: Add env variable for disabling foreground.

Setting QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM
prevents the process from having an dock icon and
taking focus.

Change-Id: Id127967d8ec1dadda790128f36a7c1f50d581433
Reviewed-on: http://codereview.qt-project.org/5968
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
13 years agoFix compilation on Harmattan
Simon Hausmann [Mon, 3 Oct 2011 15:19:07 +0000 (17:19 +0200)]
Fix compilation on Harmattan

Include Xlib.h for XInitThreads and add the SUPPORT_X11 macro
to DEFINES for Harmattan's EGL library.

Change-Id: I34ad284fe5b671f3924e406a18b8c5520df8346a
Reviewed-on: http://codereview.qt-project.org/5935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix XCB back-end on Harmattan
Simon Hausmann [Tue, 4 Oct 2011 08:36:47 +0000 (10:36 +0200)]
Fix XCB back-end on Harmattan

Use RGB16 as image format on 16-bpp displays.

Based on patch by Jocelyn

Change-Id: Ic91ab33132769da59a2097abb43b64a2d09c0009
Reviewed-on: http://codereview.qt-project.org/5971
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoDon't crash by modifying read-only shared_null
Bradley T. Hughes [Mon, 3 Oct 2011 13:21:02 +0000 (15:21 +0200)]
Don't crash by modifying read-only shared_null

Functions that modify the d-pointer must detach or otherwise take
measures to not modify the const, read-only shared_null.

The setSharable(bool) function takes care to detach when setting
sharable to false, but should avoid setting the sharable data member
unless d is not the shared null.

Similarly, QMap<Key, T>::setInsertInOrder() needs to detach if it is
shared with the shared_null (the logic has been updated to be the same
as setSharable()).

Change-Id: Ida5cb9818b86695f1b9f0264418b955c56424898
Reviewed-on: http://codereview.qt-project.org/5929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agotestlib: Fix header guard files
Sergio Ahumada [Mon, 3 Oct 2011 16:49:51 +0000 (18:49 +0200)]
testlib: Fix header guard files

Change-Id: Ia33423f9bd3f85259da908706d73cc2da4d8964d
Reviewed-on: http://codereview.qt-project.org/5937
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoAvoid using QSKIP in lieu of compile-time checks
Jason McDonald [Tue, 4 Oct 2011 00:32:49 +0000 (10:32 +1000)]
Avoid using QSKIP in lieu of compile-time checks

QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe.  If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.

Task-number: QTQAINFRA-278

Change-Id: I21664d8d92b27c26c64789fc08d0ec7b8988456a
Reviewed-on: http://codereview.qt-project.org/5941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAdded bug ref in insignificant_test comment
Jo Asplin [Mon, 3 Oct 2011 16:11:57 +0000 (18:11 +0200)]
Added bug ref in insignificant_test comment

Task-number: QTBUG-21814

Change-Id: I56907f2a1fb5555d338b6f1f695b741e1590e5d2
Reviewed-on: http://codereview.qt-project.org/5936
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
13 years ago[fontdatabase] Use the CONFIG += qpa/genericunixfontdatabase
Holger Hans Peter Freyther [Mon, 3 Oct 2011 14:46:08 +0000 (16:46 +0200)]
[fontdatabase] Use the CONFIG += qpa/genericunixfontdatabase

Late follow up of fc9a648dc03ec4531553bc3d65ae4dba3c5b5980 that
tries to make plugins indifferent of where the source is located
in relation to qtbase.

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