profile/ivi/qtbase.git
12 years agoDon't forward declare types form openssl in public headers
Lars Knoll [Thu, 24 Nov 2011 08:43:36 +0000 (09:43 +0100)]
Don't forward declare types form openssl in public headers

There's no real reason for the typedef here, QtNetwork
will compile without it and it might conflict with
openssl.

Change-Id: Id352ccc98d84ca9ee9ea3c7b4a942382882173f1
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agodirectfb: Use the QPlatformWindow in the DirectFB Backingstore
Holger Hans Peter Freyther [Mon, 21 Nov 2011 12:50:48 +0000 (13:50 +0100)]
directfb: Use the QPlatformWindow in the DirectFB Backingstore

Remove usage of QDirectFbConvenience::dfbDisplayLayer in the
QDirectFbBackingStore code and resolve the IDirectFBWindow through
the QPlatformWindow.

Change-Id: Ia7db8dedc91096648bc9de029d034002ba0d6a03
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Get the IDirectFBDisplayLayer through the QPlatformScreen
Holger Hans Peter Freyther [Mon, 21 Nov 2011 13:59:26 +0000 (14:59 +0100)]
directfb: Get the IDirectFBDisplayLayer through the QPlatformScreen

Change-Id: I1e8bacc2a5c39065f1c0667cda900730c5670066
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Fix the typo in the parameter
Holger Hans Peter Freyther [Mon, 21 Nov 2011 13:17:01 +0000 (14:17 +0100)]
directfb: Fix the typo in the parameter

Change-Id: I3d373872c533bc4b6f4f010f5cce4dbb41dbb561
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Remove dfbDisplayLayer from QDirectFbInput
Holger Hans Peter Freyther [Mon, 21 Nov 2011 13:15:03 +0000 (14:15 +0100)]
directfb: Remove dfbDisplayLayer from QDirectFbInput

Change-Id: I2ae61c40c28b337448077cff5643a007b54a3d71
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Pass the IDirectFBWindow to the QDirectFbInput methods
Holger Hans Peter Freyther [Mon, 21 Nov 2011 13:07:11 +0000 (14:07 +0100)]
directfb: Pass the IDirectFBWindow to the QDirectFbInput methods

No need to go from IDirectFBWindow -> WindowID -> IDirectFBWindow
to attach the event buffer for the event system.

Change-Id: Ia5f7c20d06e8e1da5142f1bd99ca69906107adba
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Use DirectFBErrorFatal for errors we don't handle well
Holger Hans Peter Freyther [Mon, 21 Nov 2011 12:37:59 +0000 (13:37 +0100)]
directfb: Use DirectFBErrorFatal for errors we don't handle well

In case we fail to initialize DirectFB, use the DirectFBErrorFatal
to quit as there is no way we can recover from this error and the
QPA backend has already been selected.

Change-Id: I8001bf32d0a14ba21c2ec13121748a6384b87c2b
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix HarfBuzz Thai character SARA AM handling
Jiang Jiang [Wed, 16 Nov 2011 14:27:28 +0000 (15:27 +0100)]
Fix HarfBuzz Thai character SARA AM handling

This patch is contributed by Thanomsub Noppaburana from libthai. It
added a special thai shaping function to handle SARA AM character
for fonts without OpenType rules to support it, like Nokia Pure Text
AS.

With modification to logClusters assignment to make sure that
QTextLine::glyphRuns(int from, int length) returns correct glyphs.

Task-number: QTBUG-21206
Change-Id: I5a78ee1ab2b4c874c7d0df17d4ee6d264ed5a790
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agosyncqt: Don't generate deprecated forwarding headers anymore
Tor Arne Vestbø [Tue, 22 Nov 2011 20:41:06 +0000 (21:41 +0100)]
syncqt: Don't generate deprecated forwarding headers anymore

The forwarding headers in 'include/Qt' were deprectated in Qt 4. This is
Qt 5, so time to remove them.

Change-Id: I4bf3797475b91f58af1761ed4165b552613299b3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoImprove QVector autotest
Jason McDonald [Thu, 24 Nov 2011 06:09:21 +0000 (16:09 +1000)]
Improve QVector autotest

Ensure that data row names are unique.

Change-Id: Ia6cf6e440d631928ae3352d7305c6cf2ee5b2a0c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agodirectfb: Access the screen layer through QWindow::screen()
Holger Hans Peter Freyther [Fri, 18 Nov 2011 20:09:03 +0000 (21:09 +0100)]
directfb: Access the screen layer through QWindow::screen()

Instead of assuming which layer was assigned to Qt, resolve the to
be used layer via QWindow::screen()->handle(). Add a method to the
DirectFB QPlatformScreen to provide a pointer to the IDirectFBDisplayLayer

Change-Id: Iaea9466ca84daff752a4932deafbe38f48123715
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Move QDirectFbScreen into a separate file
Holger Hans Peter Freyther [Fri, 18 Nov 2011 13:30:00 +0000 (21:30 +0800)]
directfb: Move QDirectFbScreen into a separate file

The screen handling will get a bit more complex due the integration
of different ways to do OpenGL. Move to a new file.

Change-Id: Ibe3e397d13da1b270ec4afaf046d28be50e976f9
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoOnly use QVERIFY in test functions.
Jason McDonald [Thu, 24 Nov 2011 03:46:46 +0000 (13:46 +1000)]
Only use QVERIFY in test functions.

The modified test was using QVERIFY in the destructor of a local class,
but QVERIFY should only be used directly in a test function.  This
commit changes the local class to record the result of the test and
verifies that result in the test function.

Change-Id: Ie68ac6aa880368c961ebfa67cd452f0fbf26db89
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd missing indentation to QFuture test.
Jason McDonald [Thu, 24 Nov 2011 03:15:12 +0000 (13:15 +1000)]
Add missing indentation to QFuture test.

Change-Id: Iaceaa79237d5ef6e81d1d16dc5e3fd3d97631f3a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFixed regression in tst_qscreen.
Samuel Rødal [Tue, 22 Nov 2011 16:16:11 +0000 (17:16 +0100)]
Fixed regression in tst_qscreen.

The ScreenOrientation enum was changed so that the values are power of
twos, angleBetween() needed to be fixed in order to reflect this.

Task-number: QTBUG-22554
Change-Id: Ia45dd6643b40b14204abf967b00c0d04834736a3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix stack overwrite in QDBusDemarshaller
Sami Rosendahl [Wed, 23 Nov 2011 08:03:26 +0000 (10:03 +0200)]
Fix stack overwrite in QDBusDemarshaller

QDBusArgument extraction operators and QDBusDemarshaller that implements
the extraction do not check the type of the extracted value.
Helper function template qIterGet in qdbusdemarshaller.cpp that is used
for extracting basic data types only reserves space from the stack for
the expected type as specified by client.
If the actual type in the DBus parameter is larger stack will be
overwritten in the helper function by at most 7 bytes (expected one byte,
received dbus_uint_64_t of size 8 bytes).

The fix always reserves space for the largest basic type dbus_uint64_t
readable by dbus_message_iter_get_basic API.

See also http://dbus.freedesktop.org/doc/api/html/group__DBusMessage.html#ga41c23a05e552d0574d04

Task-number: QTBUG-22735
Change-Id: I9aa25b279852ac8acc40199a39910ea4002042d7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix QT_DEPRECATED_SINCE on windows.
Olivier Goffart [Wed, 23 Nov 2011 15:13:44 +0000 (16:13 +0100)]
Fix QT_DEPRECATED_SINCE on windows.

Apparently, MSVC preprocessor do not understand correctly the defined()
in that macro (used in another #if)

Change-Id: I9bd102eb4e0cbaa65bea48db786a45d861491ad7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoImprove docs for Accessibility.
Frederik Gladhorn [Tue, 22 Nov 2011 22:12:01 +0000 (23:12 +0100)]
Improve docs for Accessibility.

While still lacking, at least try to reflect reality a bit.

Change-Id: I8fcd0bd540806f3d1e314c60d854d2a90f66c14e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoUpdate changelog - Accessibility
Frederik Gladhorn [Tue, 22 Nov 2011 13:33:15 +0000 (14:33 +0100)]
Update changelog - Accessibility

Change-Id: I03a2d8c53ebc84ebf7219bff751821e00fbfa170
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoRemove virtual child integers.
Frederik Gladhorn [Sat, 22 Oct 2011 20:38:14 +0000 (22:38 +0200)]
Remove virtual child integers.

This makes the accessibility apis much
simpler and less error prone.

Disable the itemviews implementation that is in complex widgets.
The itemviews will use the new code from itemviews.h/cpp everywhere now.

QToolBox was broken before, now at least it simply exposes all its children.
The children are the buttons (tabs of the toolbox) and their contents.

Change-Id: I45e218f49f02aebbd678ddfe29f94c2a112a2125
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoAccessible widgets: Fix warning.
Friedemann Kleint [Wed, 23 Nov 2011 09:22:21 +0000 (10:22 +0100)]
Accessible widgets: Fix warning.

Change-Id: Iaf9b112db86a4238ef24f3c6341c83ab0f9ba217
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
13 years agoDocument -system-sqlite configuration parameter
Honglei Zhang [Fri, 18 Nov 2011 09:29:53 +0000 (11:29 +0200)]
Document -system-sqlite configuration parameter

-system-sqlite should be used when system SQLite library should be
used instead of the one embedded in Qt. This information is added
to SQLite driver documentation.

Change-Id: Ie51cb0d7c4044b74a64192ad8a5c946e21ee0ed9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoSQLite support only one statement at a time
Honglei Zhang [Fri, 18 Nov 2011 08:50:07 +0000 (10:50 +0200)]
SQLite support only one statement at a time

SQLite driver support only one statement at a time. This fix makes the
exec and prepare call failed if more than one statements are given.
This is bug fix for QTBUG-21884. Also the behaviour is documented in
the API specification.

Task-number: QTBUG-21884
Change-Id: If1e25a0dd9f9ee38961ef478fc7909f6b05e360a
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
13 years agoRemove misleading comment.
Jason McDonald [Wed, 23 Nov 2011 02:53:32 +0000 (12:53 +1000)]
Remove misleading comment.

In the QProcess test, QHostInfo is used as a quick and easy way to
create a background thread, and so is not (entirely) unnecessary.

Change-Id: I7204f113e7bc8a4b312d5a20f0a6ee076c56b35d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFixed typo in testcase.prf causing TESTDATA with multiple items to fail
Rohan McGovern [Wed, 23 Nov 2011 03:05:25 +0000 (13:05 +1000)]
Fixed typo in testcase.prf causing TESTDATA with multiple items to fail

This variable was renamed from `elem' to `file' at some point in
development, but the old name was left at one place.

Change-Id: I2cda42b02a753614176b466e507e8d8d9ed80a6e
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
13 years agoAdded build system support for installing tests.
Rohan McGovern [Thu, 17 Nov 2011 05:39:19 +0000 (15:39 +1000)]
Added build system support for installing tests.

Tests will install under $$[QT_INSTALL_TESTS].

TESTDATA may be used to install additional testdata required by the
test.

The default install rule may be disabled by
CONFIG+=no_testcase_installs.

Change-Id: I204de60c8e844775906ffd016ca50bffbb414142
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoEnsure qmodule.pri is installed.
Rohan McGovern [Tue, 22 Nov 2011 06:58:30 +0000 (16:58 +1000)]
Ensure qmodule.pri is installed.

From the commit message of 0b2ce8520020a0db9b5b5feb5e72f64518d3eea5 and
the code in qt_module.prf, it is apparently intended that qmodule.pri is
installed, but this was never implemented correctly.  Make sure we
install it.

This has gone unnoticed because it happens to be installed by accident
unless $$QT_SOURCE_TREE != $$QT_BUILD_TREE and
$$QT_BUILD_TREE != $$[QT_INSTALL_PREFIX] (i.e. a shadow build which is
not using -developer-build).

Change-Id: Iee861a7bb592ca43a61ad91f1ef6a7a5bd21aff8
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoCode cleanup in QVariant and QMetaType.
Jędrzej Nowacki [Mon, 21 Nov 2011 13:08:52 +0000 (14:08 +0100)]
Code cleanup in QVariant and QMetaType.

QMetaTypeGuiHelper was generalized and renamed to QMetaTypeInterface.
From now all types will have common interface which can be used for
basic operations.

Change-Id: I50d67f4a8081fa0f75c9d530a8211593ec37bc55
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
13 years agoRemove explict debug message
Jiang Jiang [Tue, 22 Nov 2011 10:09:19 +0000 (11:09 +0100)]
Remove explict debug message

Change-Id: I8159651d4894bb828416cddb402c946bbd1a535e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agouclibc: fenv.h does not define the necessary things.
Holger Hans Peter Freyther [Tue, 15 Nov 2011 20:43:52 +0000 (21:43 +0100)]
uclibc: fenv.h does not define the necessary things.

libstdc++ provides the fenv.h found and for uclibc default toolchains
the bits/c++config.h has _GLIBCXX_HAVE_FENV_H undefined leading to
no import of the uclibc fenv.h

Change-Id: I53173b099f3d8791f527f1ccb60991de57cd19db
Filed: https://bugs.busybox.net/show_bug.cgi?id=4484
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
13 years agofixqt4headers.pl: Add --strip-module option.
Friedemann Kleint [Tue, 22 Nov 2011 11:20:04 +0000 (12:20 +0100)]
fixqt4headers.pl: Add --strip-module option.

- Add --strip-module option to strip the module name for portable
  code
- Use GetOpt::Long
- Streamline, remove need for rewinding the file
- Streamline output, just report affected classes and introduce
  --verbose for normal operation.

Change-Id: I8643a5f53d4ed8ce2ae44721164cbdba1aad8b46
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
13 years agoAdd V8 snapshot support
Kent Hansen [Fri, 18 Nov 2011 08:48:54 +0000 (09:48 +0100)]
Add V8 snapshot support

A V8 snapshot is a serialized representation of the JavaScript heap.
Using a snapshot can vastly speed up V8 initialization.

This commit introduces a new tool, mkv8snapshot. mkv8snapshot is
automatically invoked as part of building QtV8, and generates a .cpp
file which is compiled into the QtV8 library.

Because mkv8snapshot itself needs to initialize the V8 environment
the non-snapshot way (i.e., by evaluating thousands of lines of
JavaScript), it needs to build all of V8. This means that V8 is
effectively built twice when snapshots are enabled.

When cross-compiling, only host=i386 and target=arm is supported,
since that's the only relevant case for which V8 currently
supports a simulator. mkv8snapshot is built and run as a host tool
(using the simulator), and generates a snapshot that will be used
on the target.

Task-number: QTBUG-21152
Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdd some properties to QWindow
Alan Alpert [Fri, 18 Nov 2011 10:47:05 +0000 (20:47 +1000)]
Add some properties to QWindow

x,y,width,height,visible and orientation
Includes slot setters and notify signals for maximal QML compatibility.

Change-Id: I124399093c00f8ad1485d4fbae816dfbe3027eff
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agouclibc: Make the oomsimulator compile with uclibc
Holger Hans Peter Freyther [Tue, 15 Nov 2011 21:07:05 +0000 (22:07 +0100)]
uclibc: Make the oomsimulator compile with uclibc

In the infinite wisdom uclibc defines __GLIBC__ but is not a
full drop-in replacement for the GLIBC. Check for !UCLIBC. Make sure
there is a disableHooks in case the GLIBC code is not compiled

Change-Id: I246d3ee7c1d3f48f7f6445daa01a4f001b9a3cb0
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
13 years agoRevert 3a0f5d04fce00812cddd44e54ef25f7ab7d9240d
Toby Tomkins [Tue, 22 Nov 2011 06:15:55 +0000 (16:15 +1000)]
Revert 3a0f5d04fce00812cddd44e54ef25f7ab7d9240d

The removal of plugin cache in qt5 (8ed47d961dc7e6f161030654d11cd330a542eadf)
means that only the original loading error (from QElfParser) is reported.
In Qt4 this was previously two different strings depending on if the library
had been previously cached.

Task-number: QTBUG-22834

Change-Id: I15a4adc7d0f8f23f16bb2aa8ba8b968db770f074
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove reset test from QTimeLine.
Jason McDonald [Mon, 21 Nov 2011 08:07:13 +0000 (18:07 +1000)]
Remove reset test from QTimeLine.

QTimeLine::reset() never made it into the public API. Instead
QTimeLine::start() always starts from the beginning.

Remove the commented-out test for reset() and related remnants in other
tests.  Restarting a timeline using QTimeLine::start() is already tested
by the restart() test function.

Change-Id: Ia5c767ddae0781d645a407fbea76e80672895aab
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAdd test for QTimeLine::toggleDirection()
Jason McDonald [Mon, 21 Nov 2011 07:49:07 +0000 (17:49 +1000)]
Add test for QTimeLine::toggleDirection()

Before QTimeLine made it into the public API, the toggle() function
became toggleDirection() and isReversed() became the more generic
direction().  This commit uncomments the old toggle() test and uses the
final function names.

Change-Id: Ie3379f32ff0c78436f33c2733232d795ca88152b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRestore commented-out data in QString test.
Jason McDonald [Mon, 21 Nov 2011 07:26:08 +0000 (17:26 +1000)]
Restore commented-out data in QString test.

The restored test data was commented-out before the tests were imported
into the Qt repository in 2006, but appears to be valid and passes on
Linux.

Change-Id: I75795bf2b0b45fc2331bca6ac8d89f57cf12ed3d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete data from QStringRef test.
Jason McDonald [Mon, 21 Nov 2011 05:48:52 +0000 (15:48 +1000)]
Remove obsolete data from QStringRef test.

The removed data was copied from the QString test (from which it has
since been removed) and wasn't valid, as comments indicated.

Change-Id: I44f066e41d28333326ad97f652c0a6813a173f15
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete code from QRegExp test.
Jason McDonald [Mon, 21 Nov 2011 05:38:12 +0000 (15:38 +1000)]
Remove obsolete code from QRegExp test.

The removed test functions were all empty and have been commented-out
since the tests were imported into the Qt repository in 2006.

Change-Id: I4ce86440aed355352a26ebefeafc95eeda1efbdd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove handlesInputPanelVisibility() deprecation mechanism
Joona Petrell [Mon, 21 Nov 2011 14:17:50 +0000 (16:17 +0200)]
Remove handlesInputPanelVisibility() deprecation mechanism

Task-number: QTBUG-21964
Change-Id: I508ba690c90369d31ca33390d3001064857fb62e
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoSupport better committing preedit in QLineController
Pekka Vuorela [Tue, 15 Nov 2011 16:05:27 +0000 (18:05 +0200)]
Support better committing preedit in QLineController

Similar as 7851568c65e0560056c6fa541039543d43a63e20 for
QWidgetLineController

Change-Id: I7c1a1dc22e9b73515a5a72093866ac747a80896f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoSupport input method tentative commit string in QLineControl
Pekka Vuorela [Tue, 15 Nov 2011 13:09:55 +0000 (15:09 +0200)]
Support input method tentative commit string in QLineControl

Implements similar behavior as 8bd40fef0733a4796a308b3bc137a05296e142c4
did for QLineEdit.

Change-Id: I55de1f9a6703aca629f2e84398e481636c96eeca
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix QLineControl work properly with input method selection event
Pekka Vuorela [Tue, 15 Nov 2011 11:17:19 +0000 (13:17 +0200)]
Fix QLineControl work properly with input method selection event

Same as what 1189ebff320b8dd03637947c92df6e3ef84a3c06 did for
QWidgetLineControl.

Change-Id: I0991c2a2af126cfd7203829adc33bb4e6d45a7f2
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdd spaces for string concatenation to work around C++11 source incompatibility.
hjk [Mon, 21 Nov 2011 17:50:11 +0000 (18:50 +0100)]
Add spaces for string concatenation to work around C++11 source incompatibility.

Change-Id: I6acb7dca20d3bfcb24ea798c7ecd1a12464af5a6
Reviewed-by: QTBUG-22847
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoRemoved commented test data from QUrl test.
Jason McDonald [Fri, 18 Nov 2011 03:45:33 +0000 (13:45 +1000)]
Removed commented test data from QUrl test.

The removed test data is invalid for the toString() test function --
QUrl::toString() won't eliminate relative paths from URL's, you need to
call QUrl::resolved() to do that.  Add this test data to the test for
QUrl::resolved(), as the existing tests don't seem to cover the case of
a complete URL containing a relative path.

Change-Id: Idb0f4eac9cc75258a8e17f10fa95ddb75f01d470
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoQNetworkProxy documentation: mention usage of "http_proxy" variable
Peter Hartmann [Mon, 21 Nov 2011 15:07:24 +0000 (16:07 +0100)]
QNetworkProxy documentation: mention usage of "http_proxy" variable

This is done on systems other than Windows or Mac.

Change-Id: I631ea350cb9bc123edc6df33b6f661afa8f0778b
Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
13 years agoPass all key events through the shortcutmap
Lars Knoll [Thu, 13 Oct 2011 07:47:23 +0000 (09:47 +0200)]
Pass all key events through the shortcutmap

This has to happen in QGuiApp, not QApp.

Change-Id: If8a6e81df3ae9b601733d077cce57d2d21572f74
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAccessibility: Clean up usage of navigate.
Frederik Gladhorn [Tue, 15 Nov 2011 17:32:55 +0000 (18:32 +0100)]
Accessibility: Clean up usage of navigate.

Prefer to use parent/child functions instead.

Change-Id: Ic92165b9439eb750c9d762ddf5dcd2a5ccf0277d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoAdd debug stream for QAccessibleInterface.
Frederik Gladhorn [Wed, 16 Nov 2011 14:41:35 +0000 (15:41 +0100)]
Add debug stream for QAccessibleInterface.

Change-Id: I68fddac5a09bbf092c1e38c411d49dfbf640f27d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agoFix debug output in meego platform input context
Simon Hausmann [Mon, 7 Nov 2011 15:33:53 +0000 (16:33 +0100)]
Fix debug output in meego platform input context

Don't show debug output by default :)

Change-Id: I7df9264b3e0211e459cecb2cd9f389e017e9bca4
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
13 years agoGet rid of unused inputMethodEvent function
Joona Petrell [Fri, 18 Nov 2011 12:07:01 +0000 (14:07 +0200)]
Get rid of unused inputMethodEvent function

In Qt5 input method events are meant to be sent directly to
QInputPanel::inputItem() instead of the focused QWindow.

Change-Id: Idc8fe458973f066b578f6374ca33ce6f950bf9cf
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdd a roles argument to the dataChanged signal.
Stephen Kelly [Mon, 21 Nov 2011 12:34:24 +0000 (13:34 +0100)]
Add a roles argument to the dataChanged signal.

This allows more granular reporting of what has changed.

This change is binary incompatible and source compatible.

Change-Id: I7c5beaee651a24780cc94e41383f7a80210bc603
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
13 years agoRe-enable the opengl autotests on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 09:56:14 +0000 (10:56 +0100)]
Re-enable the opengl autotests on Mac OS X

All tests pass.

Change-Id: I6fde0da3900292b66f80730f08d3f0afdb0bead8
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the v8 autotest on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 09:53:33 +0000 (10:53 +0100)]
Re-enable the v8 autotest on Mac OS X

This tests passes.

Change-Id: Ia1f420c0a241d1259fbb972957b20c37f5f9dfdc
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the sql autotests on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 09:51:54 +0000 (10:51 +0100)]
Re-enable the sql autotests on Mac OS X

The QSql test currently crashes, which can destabilize the CI system
when attempting to re-enable the autotest. Skip this test for now by
disabling the check target for it.

Change-Id: I598f8ca7bce6b6f46daf6a053da5571b62486463
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the xml autotests on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 09:45:39 +0000 (10:45 +0100)]
Re-enable the xml autotests on Mac OS X

All tests pass.

Change-Id: I864b12c1045db1b2a25bd8a22635d42d55e5f0de
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the dbus autotests on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 09:44:52 +0000 (10:44 +0100)]
Re-enable the dbus autotests on Mac OS X

These tests aren't actually enabled due to the lack of dbus, but there's
no reason to explicitly disable the check target because of it.

Change-Id: I685008060c8e8d713cd27e7684cf3d474c0cf55d
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the testlib autotests on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 08:54:19 +0000 (09:54 +0100)]
Re-enable the testlib autotests on Mac OS X

All tests pass.

Change-Id: If6fa41826299bfc9f712d66df85920f01c3bdef4
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the 'other' autotests on Mac OS X
Bradley T. Hughes [Fri, 18 Nov 2011 08:43:17 +0000 (09:43 +0100)]
Re-enable the 'other' autotests on Mac OS X

All tests pass.

Change-Id: I920ef758e0b967a7ba7548e79132a1fbb3cc27c5
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRe-enable the tools autotests on Mac OS X
Bradley T. Hughes [Thu, 17 Nov 2011 13:51:00 +0000 (14:51 +0100)]
Re-enable the tools autotests on Mac OS X

All tests pass.

Change-Id: I361a0a70ca2993a0ea3bf690c3c97743ec6f5831
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoV8: Fix linking with MinGW.
Friedemann Kleint [Mon, 21 Nov 2011 10:58:18 +0000 (11:58 +0100)]
V8: Fix linking with MinGW.

Change linker flags to work with MSVC (stub.lib) and MinGW
(stub.a).

Change-Id: I9319972a133e2d3abfe046e87e2b76590608044b
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoRe-enable the integrationtests autotests on Mac OS X
Bradley T. Hughes [Wed, 16 Nov 2011 15:15:00 +0000 (16:15 +0100)]
Re-enable the integrationtests autotests on Mac OS X

The tst_MacNativeEvents, tst_QAccessibility, and tst_QFocusEvent
tests currently fail, which will block any changes that attempt to
re-enable the autotests.  Ignore the failures for now by marking the
tests as insignificant.

The tst_Lancelot for currently crashes, which can destabilize the CI
system when attempting to re-enable the autotests.  Skip this test for
now by disabling the check target for it.

Change-Id: Icc1dc77ebb9b7be746606aae04c9abf2480d0c3f
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoAdded command line argument to make hellowindow example single window.
Samuel Rødal [Mon, 21 Nov 2011 11:18:15 +0000 (12:18 +0100)]
Added command line argument to make hellowindow example single window.

Useful when testing on embedded platforms with no support for multiple
top-level windows.

Change-Id: I212ca69c3f5d5d338e860169b14e3f9f3951712b
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
13 years agoRe-enable the corelib autotests on Mac OS X
Bradley T. Hughes [Wed, 16 Nov 2011 10:21:23 +0000 (11:21 +0100)]
Re-enable the corelib autotests on Mac OS X

This is the first change to re-enable the autotests for the individual
qtbase modules. This means adding subdir.CONFIG=no_check_target for each
module (except corelib) in tests/auto/auto.pro instead of in
tests/tests.pro

QFileSystemWatcher, QIODeice, QSettings, QTextStream, QSocketNotifier,
QVariant, QPluginLoader, QLocale: These tests currently fail, which
will block any changes that attempt to re-enable the autotests. Ignore
the failures for now by marking them as insignificant.

QAbstractItemModel: This test currently crashes, which can
destabilize the CI system when attempting to re-enable the autotests.
Skip this test for now by disabling the check target for it.

Change-Id: Ie5147d5c5cfae5e7d0a495d5c4788ce92fe2e6d8
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoAdd Q_ENUMS and Q_FLAGS to enumeration InputMethodQuery and flag InputMethodQueries
Joona Petrell [Fri, 18 Nov 2011 12:10:51 +0000 (14:10 +0200)]
Add Q_ENUMS and Q_FLAGS to enumeration InputMethodQuery and flag InputMethodQueries

Change-Id: If6f535a28af06e7e1790d8876f99dcb9ab8a3b41
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoqtbase tests: Fix some warnings
Friedemann Kleint [Thu, 17 Nov 2011 14:52:53 +0000 (15:52 +0100)]
qtbase tests: Fix some warnings

- Fix warnings about QAtomicPointer/Int usage
- Fix some gcc 4.6 warnings about assigned/unused variables

Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete code from QRect test.
Jason McDonald [Mon, 21 Nov 2011 05:30:03 +0000 (15:30 +1000)]
Remove obsolete code from QRect test.

The removed code has been commented-out since Qt 4.0 and relates to
QCOORD, which was part of Qt3Support and has thus been removed from Qt5.

Change-Id: I4651738d505234abe9b79ef5045c55cbf132a88e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove empty functions from QLocale test.
Jason McDonald [Mon, 21 Nov 2011 04:52:15 +0000 (14:52 +1000)]
Remove empty functions from QLocale test.

These functions have been commented-out and empty for more than five
years.

Change-Id: I52d6dc0366cd8eae8701b05e4c66e9911bf7e8f7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRestore commented-out code in QHash test.
Jason McDonald [Mon, 21 Nov 2011 03:24:23 +0000 (13:24 +1000)]
Restore commented-out code in QHash test.

The restored code verifies the following statement in the documentation
of QHash::find():

"If the hash contains no item with the key, the function returns end()."

It is not clear why the code was commented-out in the first place, as
this occurred before the tests were imported into the Qt repository in
2006.

Change-Id: I745393a8e3e728fc60009da07abd038a3d56e99c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRestore commented-out code in QByteArray test.
Jason McDonald [Mon, 21 Nov 2011 03:02:20 +0000 (13:02 +1000)]
Restore commented-out code in QByteArray test.

The restored code was inexplicably commented-out by commit d57aec33
(non-public history), which was only supposed to be changing upper-case
booleans to lower-case.

Change-Id: I1581fc89511f600c614871e1aec6bc030cddf40e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agotst_qsslsocket: improve failure message
Rohan McGovern [Fri, 18 Nov 2011 04:16:27 +0000 (14:16 +1000)]
tst_qsslsocket: improve failure message

Cast enum to int so that we get the actual and expected values in the
failure message, rather than merely "Compared values are not the same".

Change-Id: Idc20e050c2e8a07d70f839c0a45044b070c0900e
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoRemove obsolete code from QStateMachine test.
Jason McDonald [Fri, 18 Nov 2011 07:49:11 +0000 (17:49 +1000)]
Remove obsolete code from QStateMachine test.

The removed code was already disabled because it tested API that never
made it into an official Qt release -- see commit f7d69d75 in the Qt 4.x
history.

Change-Id: I4f7eb20f937bdabfcac92842c5804233dca26a23
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete code from QStateMachine test.
Jason McDonald [Fri, 18 Nov 2011 07:36:43 +0000 (17:36 +1000)]
Remove obsolete code from QStateMachine test.

The removed code was already disabled because it tested API that never
made into an official Qt release -- see commit ad1441fc in the Qt 4.x
history.

Change-Id: I7dbfb83c82bdb79e8d3f7f6c7043d76913dea589
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agotst_qsslsocket: don't run SSLv2 tests when SSLv2 has been disabled
Rohan McGovern [Fri, 18 Nov 2011 04:15:11 +0000 (14:15 +1000)]
tst_qsslsocket: don't run SSLv2 tests when SSLv2 has been disabled

SSLv2 may be disabled in openssl at compile time.
If so, do not attempt to test it.

Change-Id: I189c8fde5b5dc8e739d54cc1adde1d3e3e217391
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoFix sporadic hang in QLocalServer::close() in OS X 10.7
Robert Knight [Fri, 18 Nov 2011 17:07:21 +0000 (18:07 +0100)]
Fix sporadic hang in QLocalServer::close() in OS X 10.7

There is a bug in CFSocket/CFRunLoopSource in OS X 10.7 which can lead to a deadlock
in CFRunLoopRemoveSource or CFRunLoopSourceInvalidate if the CFSocket manager thread
is concurrently calling CFSocketInvalidate as a result of the socket's file descriptor
having been closed.

QLocalServer::close() triggers this race by closing the socket fd before unregistering
the QSocketNotifier, which internally uses CFSocket.

This commit fixes the problem by changing the ordering in close() so that the socket notifier
is disabled before closing the file descriptor.  This change also makes QLocalServer::close()
perform operations in reverse order to QLocalServer::listen(), as would be expected.

Task-number: QTBUG-22789
Merge-request: 1470
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit a9c3f7169faf4621d39714f753d6e8b376c5d6e5)
Change-Id: Ia9c3f7169faf4621d39714f753d6e8b376c5d6e5

13 years agoCompile fix for Mac OS X 10.7 with 10.6 sdk
Andy Shaw [Thu, 10 Nov 2011 10:36:04 +0000 (11:36 +0100)]
Compile fix for Mac OS X 10.7 with 10.6 sdk

Since it is an example it is cleaner to just include the header file
as it will be available on other platforms anyway.  Also ensured that
the Qt includes were first before the system ones.

Task-number: QTBUG-22641

Merge-request: 1462
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 4fffdabc948ff6afc6008d4cb723a6a2e10eef79)
Change-Id: I4fffdabc948ff6afc6008d4cb723a6a2e10eef79

13 years agoGive better error message when using unsupported lookbehinds in QRegExp
Kjell Rune Skaaraas [Mon, 7 Nov 2011 15:18:33 +0000 (16:18 +0100)]
Give better error message when using unsupported lookbehinds in QRegExp

Merge-request: 1456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit e0383c9b8bd6f4e3d445d69690f84209cad42bb5)
Change-Id: Ie0383c9b8bd6f4e3d445d69690f84209cad42bb5

13 years agoFix QFile::copy() returning false but error() being NoError
xiechyong [Fri, 28 Oct 2011 04:07:26 +0000 (21:07 -0700)]
Fix QFile::copy() returning false but error() being NoError

Calling close() after setError() will unset the error.

Task-number: QTBUG-11982
Merge-request: 2712
Reviewed-by: ossi
(cherry picked from commit 16f67b49ae5232d4d0fb19e0333f5e2ef2a65449)
Change-Id: I16f67b49ae5232d4d0fb19e0333f5e2ef2a65449
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoHarfbuzz shaper: kerning adjustment does not need to be modified by RTL
John Tapsell [Thu, 27 Oct 2011 18:52:03 +0000 (20:52 +0200)]
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL

Merge-request: 1435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 1b928f5e41888150c4d85ff4df8a9fcab9b06d90)
Change-Id: I1b928f5e41888150c4d85ff4df8a9fcab9b06d90

13 years agoAdd -nn for .cpp MOC preprocessing for INTEGRITY
Rolland Dudemaine [Wed, 12 Oct 2011 18:38:10 +0000 (20:38 +0200)]
Add -nn for .cpp MOC preprocessing for INTEGRITY

qmake generates .gpj project files for INTEGRITY.
Calls to moc on headers or code that do not produce actual output cause
a Note to be generated. This is considered as an error during build by
the Green Hills gbuild build tool.
-nn can be added to not generate that note when no output is generated.
This was already done for headers in util/integrity/qt.bod, but it was
not there yet for .cpp files.

Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 480b2f4c79160afaac7934936d3ae6ea382ae2bb)
Change-Id: I480b2f4c79160afaac7934936d3ae6ea382ae2bb

13 years agoRemove commented out code.
Rolland Dudemaine [Wed, 12 Oct 2011 18:38:09 +0000 (20:38 +0200)]
Remove commented out code.

Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e)
Change-Id: Ic37ba1319c5789b82e14b84e9bc85ceff7cc6b5e

13 years agoBuild fix for WINCE to qfilesystemengine_win.cpp
jaanttil [Wed, 5 Oct 2011 19:28:19 +0000 (21:28 +0200)]
Build fix for WINCE to qfilesystemengine_win.cpp

Merge-request: 2662
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit f4f1b712e1389987e045bb8f6ba654ea9e11d24e)
Change-Id: If4f1b712e1389987e045bb8f6ba654ea9e11d24e

13 years agoFixed typo in QSettings documentation.
Sam Protsenko [Wed, 5 Oct 2011 17:42:21 +0000 (19:42 +0200)]
Fixed typo in QSettings documentation.

Merge-request: 1411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit af448ba50d1c89548d41b7aebdf6047e8f2aabf2)
Change-Id: Iaf448ba50d1c89548d41b7aebdf6047e8f2aabf2

13 years agoQNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
shkim [Thu, 29 Sep 2011 14:14:05 +0000 (16:14 +0200)]
QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.

Merge-request: 2690
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 4245a82a3eed3ec21b6affc5836af5b2ad2d42e4)
Change-Id: I4245a82a3eed3ec21b6affc5836af5b2ad2d42e4

13 years agoFix broken Solaris build (getpwnam_r usage)
Iikka Eklund [Thu, 22 Sep 2011 13:11:42 +0000 (15:11 +0200)]
Fix broken Solaris build (getpwnam_r usage)

Added ifdef inside qt_tildeExpansion function to use correct
version of getpwnam_r depending on _C_POSIX_SOURCE version
on Solaris platform.

Task-number: QTBUG-21451
Merge-request: 1380
Reviewed-by: ossi
(cherry picked from commit 48f64fc7ae9f0e9e8ab07ab60ccd55d3b053dfab)
Change-Id: I48f64fc7ae9f0e9e8ab07ab60ccd55d3b053dfab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoadding a getter cubicBezierSpline() to QEasingCurve
Thomas Hartmann [Fri, 18 Nov 2011 16:32:47 +0000 (17:32 +0100)]
adding a getter cubicBezierSpline() to QEasingCurve

Change-Id: Ida722f013613d8633867a902660da30d28aeb918
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoconfigure.exe: Reduce size by using -O1 instead of -O2.
Friedemann Kleint [Fri, 18 Nov 2011 15:18:41 +0000 (16:18 +0100)]
configure.exe: Reduce size by using -O1 instead of -O2.

Change-Id: Ica4d19364415180411cd74df7c3fb92d0100bfba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agomkspecs: Case-insensitive check of paths on Windows.
Friedemann Kleint [Thu, 17 Nov 2011 15:00:12 +0000 (16:00 +0100)]
mkspecs: Case-insensitive check of paths on Windows.

Change-Id: I2b46bce79774ed9e5b5f6d73cc6e62ae50e35a5e
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoWindows: Adapt mkspec for MinGW / gcc 4.6.
Friedemann Kleint [Thu, 17 Nov 2011 08:18:05 +0000 (09:18 +0100)]
Windows: Adapt mkspec for MinGW / gcc 4.6.

gcc 4.6 becomes the minimum required version in Qt 5.

See also d4150975af620e2889cc58bd476bac6b4d101db3
in Qt 4.8.

Change-Id: If66ce0be755263c20b0a4371523c6590592d962d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoDocument new input method hints introduced in Qt 5
Joona Petrell [Wed, 16 Nov 2011 13:42:20 +0000 (15:42 +0200)]
Document new input method hints introduced in Qt 5

Change-Id: Ic6aa77b410ed8189c2b100ca527a7019cdaf3b8b
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoResolve a number of compilation issues with INTEGRITY
Rolland Dudemaine [Mon, 19 Sep 2011 15:03:22 +0000 (17:03 +0200)]
Resolve a number of compilation issues with INTEGRITY

First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode.
Also, correct a typo and add missing files to io.pri.
Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools.
Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it.
Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition).

Merge-request: 2686
Reviewed-by: ossi
(cherry picked from commit 8fe04a14b1f3688c9ce0933ebec0c28616595d93)
Change-Id: I8fe04a14b1f3688c9ce0933ebec0c28616595d93
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agofix doc typo
Oswald Buddenhagen [Mon, 5 Sep 2011 15:33:33 +0000 (17:33 +0200)]
fix doc typo

(cherry picked from commit 9c86b3b0028d79cbca129afafa33d72d624d65c3)
Change-Id: I9c86b3b0028d79cbca129afafa33d72d624d65c3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoEnsure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
Oswald Buddenhagen [Mon, 5 Sep 2011 15:23:53 +0000 (17:23 +0200)]
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk

When the 10.7 SDK was specified explicitly then it would fail the check
inside the pro file.  So this ensures that this is accounted for.

Task-number: QTBUG-20516

Merge-request: 2657
Reviewed-by: ossi
(cherry picked from commit ce1a25fc692abcaa1c825f465d6a158efa953b06)
Change-Id: Ice1a25fc692abcaa1c825f465d6a158efa953b06
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoremove obsolete define
Oswald Buddenhagen [Mon, 5 Sep 2011 15:24:07 +0000 (17:24 +0200)]
remove obsolete define

(cherry picked from commit 85cd78b01812d108f381e42b044abaa888c4146e)
Change-Id: I85cd78b01812d108f381e42b044abaa888c4146e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix a memory leak in QXcbConnection.
Jędrzej Nowacki [Thu, 17 Nov 2011 15:58:38 +0000 (16:58 +0100)]
Fix a memory leak in QXcbConnection.

Change-Id: I2307bf434c53d9321c71609eeacc1f3883bbbb13
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoqtbase: Warnings fixes.
Friedemann Kleint [Thu, 17 Nov 2011 16:09:32 +0000 (17:09 +0100)]
qtbase: Warnings fixes.

Change-Id: Ie97e36bc168b3de3cae2d0eb615e777884529a06
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoImprove diagnostics of QPluginLoader test.
Jason McDonald [Fri, 18 Nov 2011 07:24:38 +0000 (17:24 +1000)]
Improve diagnostics of QPluginLoader test.

Use QVERIFY2 so that the test output shows the full error string when it
does not contain the expected sub-string.

Change-Id: I31f91bd5c47c082aacabd2333bc12137bc4d24a6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix indentation of QPluginLoader test.
Jason McDonald [Fri, 18 Nov 2011 07:20:50 +0000 (17:20 +1000)]
Fix indentation of QPluginLoader test.

Change-Id: I4c6957d2a67ac387232226098b4490e3d5a86d51
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove QPluginLoader autotest diagnostics.
Jason McDonald [Fri, 18 Nov 2011 07:12:09 +0000 (17:12 +1000)]
Improve QPluginLoader autotest diagnostics.

Previously, the user had to recompile the test with an additional define
to see the plugin loader error string.  By re-ordering the verification
statements, we can ensure that the error string is visible in the test
results whenever its value is not the expected value, thus eliminating
the need for conditional diagnostics.

Change-Id: Iae9ef0b7cbad551fd56f0e0439eaad034f2420e3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>