profile/ivi/qtbase.git
13 years agoUse a QFunctionPointer for getProcAddress()
Casper van Donderen [Wed, 12 Oct 2011 11:52:04 +0000 (13:52 +0200)]
Use a QFunctionPointer for getProcAddress()

qdoc does not understand the void (*) syntax, there is a typedef to
QFunctionPointer that does work.

Change-Id: Idbe9d43d00f8676304d088d72795b6ddb7e4ee72
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoReplace Q_WS_WIN by Q_OS_WIN in uic/network.
Friedemann Kleint [Mon, 17 Oct 2011 10:15:29 +0000 (12:15 +0200)]
Replace Q_WS_WIN by Q_OS_WIN in uic/network.

Change-Id: I592936859f6932fcd1aa47f0617ba9f8efee86dc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoPrefer QSKIP to QTEST_NOOP_MAIN.
Jason McDonald [Mon, 17 Oct 2011 04:32:54 +0000 (14:32 +1000)]
Prefer QSKIP to QTEST_NOOP_MAIN.

There is no way for a .pro file to know if exceptions are supported in
the Qt build, so these tests cannot be omitted from the build if
exceptions are not supported. Because of this limitation, these tests
were using QTEST_NOOP_MAIN when exceptions were not available, making
the tests appear to pass.  This commit changes QTEST_NOOP_MAIN to QSKIP,
so that the user receives a clear indication that the test isn't testing
anything when exceptions are not available.

Change-Id: I2facf08ba69e6f985e2da50dd36ad2658246b22e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAdd a warning and a return value to xcb's createGLPlatformContext
Laszlo Agocs [Fri, 14 Oct 2011 21:17:30 +0000 (00:17 +0300)]
Add a warning and a return value to xcb's createGLPlatformContext

There was no value returned previously when none of GLX, EGL, DRI was
enabled. Now we show a warning message and return null (resulting in a
crash). Previously not returning a value resulted in obscure crashes
with strange-looking call stacks, now it will be clear what the
problem is.

This is particularly important because not having libx11-xcb-dev
installed results in silently disabled xlib support which in turn
disallows the usage of glx too. The result is an obscure crash in any
GL (e.g. QML2) app. Now there will be a proper warning message at
least.

Change-Id: I15cf3a6c16ca373d4ada7abb6d3c8f7e30c1e03d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoDo not fail user time window creation when xcb is using xlib
Laszlo Agocs [Fri, 14 Oct 2011 21:04:09 +0000 (00:04 +0300)]
Do not fail user time window creation when xcb is using xlib

QXcbWindow::updateNetWmUserTime() creates a new window using the
actual window as its parent. This operation was failing when Xlib
usage and GLX (or EGL) was enabled because in these cases the real
window was created with a different visual using XCreateWindow.

For the user time window however we were passing the xcb_screen's
root_visual always, and this cannot work when Xlib+GLX/EGL is in use,
resulting in a BAD_MATCH (followed by some annoying flicker on the
screen on Ubuntu at least, or a full log off (X crash?) on Fedora).

The patch saves the visual id used to create the actual window and
passes that when creating the user time window. This way the creation
of the user time window succeeds with Xlib+GLX too.

Change-Id: If3925d9ac1670d385dcc7c2b475c196908569f06
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoRemove qcopchannel autotest.
Jason McDonald [Mon, 17 Oct 2011 04:10:53 +0000 (14:10 +1000)]
Remove qcopchannel autotest.

The QCopChannel class was removed during Qt5 refactoring.

Change-Id: I62914eca1db65c680d90233ce9dad5d891890c4a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDon't build empty tests.
Jason McDonald [Wed, 12 Oct 2011 02:36:25 +0000 (12:36 +1000)]
Don't build empty tests.

The qgraphicswidget and qgraphicsproxywidget tests are empty if Qt is
built without the cleanlooks style, so don't build the tests in that
case.

Change-Id: I2308e723a9b0abcc3e95b32a562fcb02afe0444d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoOnly build exceptionsafety_objects test if useful
Jason McDonald [Wed, 12 Oct 2011 04:51:09 +0000 (14:51 +1000)]
Only build exceptionsafety_objects test if useful

The test appears to be applicable only if building with g++, and even
then the test is broken.

Change-Id: I9eefb13325a10ec295a59c2bd1111e3c324ff94f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove Mac accessibility autotest.
Jason McDonald [Wed, 12 Oct 2011 01:35:52 +0000 (11:35 +1000)]
Remove Mac accessibility autotest.

This test was empty, the logic having been recently removed because it
only applied to the Carbon UI, which will not be supported by Qt5.

Change-Id: I2b5d6aba6be4a51eadbac3ca9d19d1a68c4fc1ab
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoTidy qwizard autotest .pro file
Jason McDonald [Wed, 12 Oct 2011 01:13:26 +0000 (11:13 +1000)]
Tidy qwizard autotest .pro file

Remove commented out sources and redundant Symbian-specific directive.

Change-Id: I7637b4dfc186eeac7f314faf13aa97e8ef1990de
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove QtMD5 autotest.
Jason McDonald [Wed, 12 Oct 2011 00:59:56 +0000 (10:59 +1000)]
Remove QtMD5 autotest.

This test is only valid with obsolete Qt Solutions packages.  Any Qt
Solutions that are still of value need to be rewritten as Qt5 addons and
will be delivered with their own unit tests.

Change-Id: I099ef816655cc7de13715f5a4e5f4a06099df2d5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMake test .pro files more consistent.
Jason McDonald [Tue, 11 Oct 2011 08:21:54 +0000 (18:21 +1000)]
Make test .pro files more consistent.

Make the parent .pro files follow the pattern of listing all tests in
one place and then removing inapplicable tests as needed.

Change-Id: Ide1ae98d50dd63cd8c1b4d6fd53135cdff801bc3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDon't build empty qwineventnotifier test.
Jason McDonald [Tue, 11 Oct 2011 07:42:44 +0000 (17:42 +1000)]
Don't build empty qwineventnotifier test.

This test is only useful on Windows, so avoid building it elsewhere
rather than building an empty test.

Change-Id: I01d91266bcb2dd242e02e70741ad5b81a13c33f0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove redundant logic from tools autotests.
Jason McDonald [Tue, 11 Oct 2011 07:40:43 +0000 (17:40 +1000)]
Remove redundant logic from tools autotests.

The tools tests are not built for cross-compiled Qt builds, so the logic
to make those tests empty when cross-compiled is redundant.

Change-Id: Ia3a3a680d7ade2cee78aa633b41c9ef5be6f2f15
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDon't build empty qaccessibility test on WinCE.
Jason McDonald [Tue, 11 Oct 2011 07:36:37 +0000 (17:36 +1000)]
Don't build empty qaccessibility test on WinCE.

Rather than building the test with all the logic #ifdef'd out, just
avoid building the test at all.

Change-Id: I394f48b2dacb40325d03de719096da36fcb7312a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoOnly build Mac-specific tests on Mac.
Jason McDonald [Tue, 11 Oct 2011 06:17:19 +0000 (16:17 +1000)]
Only build Mac-specific tests on Mac.

All but one of these tests was already excluded from the build on
non-Mac platforms, but still had #ifdef's to make the test empty if
compiled on a non-Mac platform.

Change-Id: I1a3677c1cdb7bd467cf4317ed4cfbac89e934e76
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoLess friends is good, at least for C++ code :)
Lars Knoll [Wed, 12 Oct 2011 20:36:41 +0000 (22:36 +0200)]
Less friends is good, at least for C++ code :)

Change-Id: Ia46359ee80eb30b8e16a02b7d5376cc9610fac84
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoQHttpNetworkConnection: fix compile warning
Martin Petersson [Thu, 13 Oct 2011 08:54:43 +0000 (10:54 +0200)]
QHttpNetworkConnection: fix compile warning

Change-Id: I05f114dcb1c43a98c416d02b3e764dcb40d56e09
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoAdd QGlyphRun::SplitLigature flag
Eskil Abrahamsen Blomfeldt [Wed, 12 Oct 2011 06:25:45 +0000 (08:25 +0200)]
Add QGlyphRun::SplitLigature flag

If the glyph run is generated based on characters which split a
ligature glyph, it needs to include the ligature glyph in the run,
and when painting, we need to clip the painter to the reported
bounding rect of the run in order to avoid painting too much of
the ligature. To make it possible to reduce clipping to a
minimum, we need a flag to inform of whether the glyph run contains
a split ligature or not.

Change-Id: Id787e0bec6d6e8e06cc818700ae0fca22cf81e98
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoDisable ELF interpreter check when cross-compiling
Harald Fernengel [Tue, 13 Sep 2011 10:15:22 +0000 (12:15 +0200)]
Disable ELF interpreter check when cross-compiling

It's not a good idea to look at the host's /bin/ls when cross-compiling

Change-Id: I1fe67b17abd92f01c1d89146227c5419eaa3242f
Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoqmake: fix incrementalLinker option writing for vcxproj
Joerg Bornemann [Fri, 14 Oct 2011 14:52:26 +0000 (16:52 +0200)]
qmake: fix incrementalLinker option writing for vcxproj

Change-Id: I7d3b33a3a2e2f7c89ea956cd1304e7d2e365151f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoAvoid using 0 as the default winId in QPlatformWindow.
Laszlo Agocs [Fri, 14 Oct 2011 14:11:06 +0000 (17:11 +0300)]
Avoid using 0 as the default winId in QPlatformWindow.

When the platform plugin does not reimplement QPlatformWindow::winId()
to return a non-zero value, the default implementation provides a WId
of 0. This breaks various scenarios with QWidgets which, for example
in nativeParentWidget(), rely on internalWinId() being non-zero for
TLWs.

As a result, apps like collidingmice will crash with the 'minimal'
platform plugin when they try to do markDirtyOnScreen for the graphics
view's viewport widget because viewport()->nativeParentWidget()
unexpectedly returns null, even though it should return the
QGraphicsView.

The patch makes the default value WId(1) in order to to avoid this.

Change-Id: Iafef2e510e32b5610b8cef742313e9119ed64963
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoMake the window active in eglfs and minimal plaform plugins.
Laszlo Agocs [Fri, 14 Oct 2011 07:35:44 +0000 (10:35 +0300)]
Make the window active in eglfs and minimal plaform plugins.

Without a call to QWindowSystemInterface::handleWindowActivated() or
QPlatformWindow::requestWindowActivated() QGuiApplication's
activeWindow() and focusWindow() will return 0 all the time, and this
breaks key event delivery when key events are received not from a
windowing system but directly from e.g. evdev. In such cases the only
choice is to send the event to the active window but if there isn't
one the event will be lost.

These platforms will have one fullscreen window at a time so marking
it the active one should be a safe assumption.

Change-Id: Ia6f0e9f021fbd61bbd368ddc46f8a13fccda1c2f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoRemove commented out reference to QShortcutMap
Lars Knoll [Wed, 12 Oct 2011 21:00:29 +0000 (23:00 +0200)]
Remove commented out reference to QShortcutMap

Change-Id: I62ca413c4f5e11e5ba91dcbb05d8088ca1d7a2b9
Reviewed-on: http://codereview.qt-project.org/6582
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAdd autotest for QMetaType creation of gui types
Kent Hansen [Fri, 7 Oct 2011 09:56:28 +0000 (11:56 +0200)]
Add autotest for QMetaType creation of gui types

This test verifies that all gui types with built-in QMetaType
support can be created, either using the default constructor
or the copy constructor.

Change-Id: Ibb1c5aab8571b598638c74112471d6869516a202
Reviewed-on: http://codereview.qt-project.org/6344
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoImprove the QMetaType::create() autotest coverage
Kent Hansen [Fri, 7 Oct 2011 08:35:34 +0000 (10:35 +0200)]
Improve the QMetaType::create() autotest coverage

It only tested creating a copy of QSize.
This change adds testing of all core types, both
copy and non-copy creation.

Change-Id: If2b8fb45718c4a976dd8b883b332878f7fb0da6f
Reviewed-on: http://codereview.qt-project.org/6343
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoRemove dependencies of QShortcutMap onto widgets
Lars Knoll [Wed, 12 Oct 2011 20:07:45 +0000 (22:07 +0200)]
Remove dependencies of QShortcutMap onto widgets

This is the first towards bringing shortcut support
back into QtGui.

Change-Id: Ic2cf376d08c326402fb90a0cf170a987b07ac304
Reviewed-on: http://codereview.qt-project.org/6577
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoSmall re-factor of QVariant autotest.
Jędrzej Nowacki [Wed, 12 Oct 2011 08:38:28 +0000 (10:38 +0200)]
Small re-factor of QVariant autotest.

Enrich playWithVaraint template by a macro that returns correct line
number in case of failure.

Change-Id: I7684169852481a6905b71e4420135e7e3f298b12
Reviewed-on: http://codereview.qt-project.org/6570
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
13 years agoAccessibility plugin for mac and xcb.
Frederik Gladhorn [Tue, 11 Oct 2011 12:43:28 +0000 (14:43 +0200)]
Accessibility plugin for mac and xcb.

Instead of creating new instances of the class whenever
accessibility() is called, create one on startup.

Change-Id: Idd5b06ee935d7acf4934b98882d254a1ef0ca04e
Reviewed-on: http://codereview.qt-project.org/6435
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoFix OpenGL on Harmattan showing only the first frame.
Jocelyn Turcotte [Wed, 12 Oct 2011 09:53:01 +0000 (11:53 +0200)]
Fix OpenGL on Harmattan showing only the first frame.

swapBuffers would wait until DRI2_InvalidateBuffers was received from the
X server, but would never receive it since we are not running the xlib event loop.

This patch calls the XESetWireToEvent xlib callback of an unhandled event from the
xcb event loop directly, if one is available for its response type.

Change-Id: I3b4ef3f6e3efbae25f49f161e229e9b15e951778
Reviewed-on: http://codereview.qt-project.org/6557
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoCalculate an area in the touchscreen qpa plugin.
Laszlo Agocs [Thu, 13 Oct 2011 05:55:56 +0000 (08:55 +0300)]
Calculate an area in the touchscreen qpa plugin.

Instead of ignoring the touch major/minor and returning a rectangle
with width and height of 1, the size of the area is now calculated
based on the major. This is incomplete and far from perfect but at
least it makes visualizers, like the fingerpaint example app, work out
of the box.

Change-Id: I3bb70b4d7247f289e5cae4e7de2460ecf2c9d009
Reviewed-on: http://codereview.qt-project.org/6566
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
13 years agoRemove Q_WS_ and Q_OS_SYMBIAN from QtGui.
Friedemann Kleint [Thu, 13 Oct 2011 12:25:18 +0000 (14:25 +0200)]
Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.

Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix struct/class mismatch.
Friedemann Kleint [Thu, 13 Oct 2011 12:29:30 +0000 (14:29 +0200)]
Fix struct/class mismatch.

Change-Id: I282c9d9e10b0783cc10d32de031a30d07b802a55
Reviewed-on: http://codereview.qt-project.org/6610
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix build on Harmattan when cross-compiling
Simon Hausmann [Wed, 12 Oct 2011 08:11:30 +0000 (10:11 +0200)]
Fix build on Harmattan when cross-compiling

When configure detects the presence of font-config/freetype via pkg-config
_and_ we are cross-compiling for Harmattan, make sure that we pick up the
include path for freetype. The .pri file is included in various places in
qtbase when the usage of freetype is required.

Change-Id: I4a5390dfc063504def80a891bc9153d6a376ccd7
Reviewed-on: http://codereview.qt-project.org/6509
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoCocoa: Update QPlatformWindow geometry on move
Morten Sorvig [Wed, 12 Oct 2011 12:42:38 +0000 (14:42 +0200)]
Cocoa: Update QPlatformWindow geometry on move

Change-Id: I976e4da646480d10cc6af444288c421d0645f689
Reviewed-on: http://codereview.qt-project.org/6541
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoMigrate the touchscreen generic qpa plugin to QWindow.
Laszlo Agocs [Wed, 12 Oct 2011 11:41:52 +0000 (14:41 +0300)]
Migrate the touchscreen generic qpa plugin to QWindow.

This plugin was still using QApplication and QDesktopWidget. The code
is now migrated to QGuiApplication, QWindow, and QScreen.

Change-Id: I22a7e15982efea16cbf560d09c8831cd82ed29d0
Reviewed-on: http://codereview.qt-project.org/6528
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
13 years agoQNetworkAccessManager: hostInfo lookup should use proxy if set
Martin Petersson [Tue, 11 Oct 2011 14:36:55 +0000 (16:36 +0200)]
QNetworkAccessManager: hostInfo lookup should use proxy if set

startHostInfoLookup will try to detect if IPv4 or IPv6 will be used
when connecting to the host. If a proxy is set we should lookup
the proxy hostname instead, in case host name can't be resolved
via DNS and should be resolved by the proxy.

Task-number: QTBUG-21889
Change-Id: I2012798784fc40f153469a1298e261c52981297e
Reviewed-on: http://codereview.qt-project.org/6447
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
13 years agofix tst_QNetworkReply::headFromHttp failure
Shane Kearns [Tue, 11 Oct 2011 15:59:51 +0000 (16:59 +0100)]
fix tst_QNetworkReply::headFromHttp failure

The reference file has suffered whitespace changes during the cherry
pick from 4.8. Refetched from the test server.

Change-Id: I03a0b7a66cf6743de3391905422b2f4cdcd86dcf
Reviewed-on: http://codereview.qt-project.org/6454
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
13 years agoDo not unconditionally use pkg-config in .pro files
Rohan McGovern [Wed, 12 Oct 2011 05:49:24 +0000 (15:49 +1000)]
Do not unconditionally use pkg-config in .pro files

Using the first pkg-config in PATH is prone to errors when
cross compiling.  This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used).  However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.

Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.

(cherry picked from commit 53794d94994cb3149581b1a91762dfa2d6defac0)

Change-Id: I53794d94994cb3149581b1a91762dfa2d6defac0
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6488
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAvoid building empty, inapplicable QWS tests.
Jason McDonald [Tue, 11 Oct 2011 05:56:19 +0000 (15:56 +1000)]
Avoid building empty, inapplicable QWS tests.

It is better to avoid building a test when we know that it is not
applicable, rather than building an empty test that appears to pass.
Note that some of the tests were already excluded by
tests/auto/other.pro, but still had the preprocessor directives to make
an empty test.

Change-Id: I71b75c37a05f6e20dbef43d82f72b29b35ef496a
Reviewed-on: http://codereview.qt-project.org/6410
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoExclude qtconcurrent tests via .pro files.
Jason McDonald [Tue, 11 Oct 2011 04:15:52 +0000 (14:15 +1000)]
Exclude qtconcurrent tests via .pro files.

If Qt is built without QtConcurrent, the relevant autotests should be
excluded from the build, rather than building empty tests that appear
to pass and thus produce confusing test results.

Change-Id: I43bafcb0ffa42e8981bec4e27bf6a23a28d86df9
Reviewed-on: http://codereview.qt-project.org/6395
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix platformsocketengine test failures
Shane Kearns [Wed, 12 Oct 2011 13:00:56 +0000 (14:00 +0100)]
Fix platformsocketengine test failures

The platformsocketengine autotest uses the native socket engine directly
rather than through QAbstractSocket. The bind tests were failing because
the autotest was creating a socket with IPv4 (AF_INET) and then binding
with QHostAddress::Any (AF_INET6).
A linux kernel update caused this to start failing on the test machines.

Change-Id: Iea62f3d56dbfb35fcb952dcf00313578eb2bd764
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoMake CONFIG+=GNUmake respect shadow builds
Tor Arne Vestbø [Tue, 11 Oct 2011 18:27:22 +0000 (20:27 +0200)]
Make CONFIG+=GNUmake respect shadow builds

Previously we were generating include lines based on the relative path of
the source file, which resulted in the .d files being placed in the source
dir as well. We now expect the .d files to live in the output dir, but keep
the dependency from the .d file to the original source file.

Before:

   .deps/%.d: %.cpp
   -include .deps/../../src/foo.d

After:

   .deps/%.d: ../../src/%.cpp
   -include .deps/foo.d

Change-Id: I749adeb671cf8424f0849521c5bb1489eb3e76d5
Reviewed-on: http://codereview.qt-project.org/6455
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoFix construction races in QtNetwork
Shane Kearns [Thu, 6 Oct 2011 14:40:34 +0000 (15:40 +0100)]
Fix construction races in QtNetwork

When two threads construct a QNetworkAccessManager at exactly the
same time on an SMP system, there are construction races for some
Q_GLOBAL_STATIC data. This is normal and expected - the losing
thread deletes its instance as part of the Q_GLOBAL_STATIC macro.

For QNetworkAccessBackendFactoryData, a guard mechanism intended
to prevent the data being reconstructed by destructors of other
global static classes was being set by the loser.
To fix this, the bool is changed to a QAtomicInt. In the normal
case, it will have value 0->1 on startup and 1->0 on shutdown.
In the race case, it will have values 0->1->2->1 on startup and
1->0 on shutdown.

Task-Number: QTBUG-20343

Change-Id: Ie3fe38944d10809d1ccdbe772df82d67faffe19c
Reviewed-on: http://codereview.qt-project.org/6181
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoWindows: Adapt to new Lighthouse API
Friedemann Kleint [Tue, 11 Oct 2011 14:33:42 +0000 (16:33 +0200)]
Windows: Adapt to new Lighthouse API

- Implement debug/deprecated options of QSurfaceFormat
- Implement stylehints
- Fixed input context to position the input window correctly.

Change-Id: Icba22f183c6895e30bd34d60cf6d2307ed3188cd
Reviewed-on: http://codereview.qt-project.org/6446
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoMove input panel visibility ownership from QInputPanel to QPlatformInputContext
Joona Petrell [Tue, 11 Oct 2011 10:10:50 +0000 (13:10 +0300)]
Move input panel visibility ownership from QInputPanel to QPlatformInputContext

Now QInputPanel::visible() can be set true even when platform doesn't provide
a virtual keyboard. Like keyboard geometry, visibility should be dictated by
the platform plugin and not QInputPanel, whose role is more like that of a mediator.
QInputPanel::show() and ::hide() calls should be treated as requests that may fail.
Changed the QInputPanel's visible property to read-only as a setter that may
fail is not really a setter, show() and hide() should be used instead.

Enabling the new functionality cannot be activated immediatelly without breaking
existing keyboards, added a temporary function handlesInputPanelVisibility that
handovers the responsiblity of updating input panel visibility to QInputContextPlatform
only once QInputContextPlatform says that it is able to handle it.

Change-Id: Ideecaf7225cc3971f33a0ac976bd92cf7767475b
Reviewed-on: http://codereview.qt-project.org/6429
Sanity-Review: 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>
13 years agoRemove stale documentation and fix qdoc errors.
Casper van Donderen [Tue, 11 Oct 2011 11:02:48 +0000 (13:02 +0200)]
Remove stale documentation and fix qdoc errors.

Change-Id: I51bb0c52eb32d9d672d115f31b16d414f81708e2
Reviewed-on: http://codereview.qt-project.org/6433
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
13 years agoQTextEdit - Fix selectionChange emission bug
Pekka Vuorela [Thu, 6 Oct 2011 12:10:24 +0000 (15:10 +0300)]
QTextEdit - Fix selectionChange emission bug

QTextEdit did not emit selectionChange signal if selection
availability did not change, but the start or end of the selection did.
This was causing unit test to fail.

Change-Id: Iea0cb0bae767bc8d2dd36141362f9a084af97266
Reviewed-on: http://codereview.qt-project.org/6426
Sanity-Review: 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 agoRemoved obsolete custom input context support
Pekka Vuorela [Thu, 6 Oct 2011 14:04:07 +0000 (17:04 +0300)]
Removed obsolete custom input context support

Removed from QWidgetPrivate and QWidgetTextControl. Now using only
application specific input context.

Change-Id: Id25882e72026f58dab51a18e5d04a11225429963
Reviewed-on: http://codereview.qt-project.org/6427
Sanity-Review: 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 agoRename QMetaType::construct() to create()
Kent Hansen [Thu, 6 Oct 2011 11:25:58 +0000 (13:25 +0200)]
Rename QMetaType::construct() to create()

create() is symmetric with destroy().

Also rename the internal methods and fields to be
consistent (qDeleteHelper already had the "right"
name, though!).

This change will allow us to use construct() and
destruct() for something else: Placement new-style
allocation (QTBUG-12574).

The old construct() is still kept for now, until
the other repositories have been updated to use
create().

Change-Id: Iceb184af6cffcb0a634359cfc3516c718ba0c2f5
Reviewed-on: http://codereview.qt-project.org/6342
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoDon't crash when no usable font is available
Jiang Jiang [Mon, 10 Oct 2011 15:43:59 +0000 (17:43 +0200)]
Don't crash when no usable font is available

We will fallback to box engine when no usable font is available,
and QRawFont (which scenegraph depends on) won't allocate glyph
index array on certain occasions. In those cases, QFontEngineBox
needs to support GlyphIndicesOnly flag.

Change-Id: I408ddd1b2f1a5f7ac2b6681cb7bf531bbbfc68e6
Reviewed-on: http://codereview.qt-project.org/6360
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
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>