profile/ivi/qtbase.git
12 years agoDoc: Modularize QtPrintSupport documentation.
Casper van Donderen [Tue, 8 May 2012 09:13:18 +0000 (11:13 +0200)]
Doc: Modularize QtPrintSupport documentation.

This change moves the snippets and images to the modularized
directories.

Change-Id: Ib8f8556bcef13593ee40ac1122d765ed307ecb93
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Modularize QtOpenGL documentation.
Casper van Donderen [Tue, 8 May 2012 08:28:29 +0000 (10:28 +0200)]
Doc: Modularize QtOpenGL documentation.

This change moves the snippets to the modularized directories.

Change-Id: Ifcf22fa3f234681f851d1e7eed5fe44e2e223ffd
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Modularize QtWidgets documentation.
Casper van Donderen [Mon, 7 May 2012 16:49:48 +0000 (18:49 +0200)]
Doc: Modularize QtWidgets documentation.

This change moves the snippets and images to the modularized
directories.

Change-Id: Idec1afb9db7ea6add1ca4cf25ec4019d8bce0c4d
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Modularize QtGui documentation.
Casper van Donderen [Mon, 7 May 2012 13:50:31 +0000 (15:50 +0200)]
Doc: Modularize QtGui documentation.

This change moves the snippets and images to the modularized
directories.

Change-Id: I5f86f598fbe7c47d632c613b85d94ced89ba2c29
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Modularize QtDBus documentation and add missing file to QtNetwork.
Casper van Donderen [Mon, 7 May 2012 12:03:02 +0000 (14:03 +0200)]
Doc: Modularize QtDBus documentation and add missing file to QtNetwork.

This change moves the snippets and images to the modularized
directories.

Change-Id: Idacff866735d00b048d65318bc4c3ee1dfa16310
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Modularize QtConcurrent documentation.
Casper van Donderen [Mon, 7 May 2012 09:33:42 +0000 (11:33 +0200)]
Doc: Modularize QtConcurrent documentation.

This change moves the snippets and images to the modularized directories.

Change-Id: If52f69c0f8bb4d2df4ee46f5524a82047ec214de
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Fix typo in QtNetwork qdocconf.
Casper van Donderen [Mon, 7 May 2012 09:19:53 +0000 (11:19 +0200)]
Doc: Fix typo in QtNetwork qdocconf.

Change-Id: I759e8a77b0471d380ffd9f893ae5bb5ed0c5c992
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoDoc: Modularize QtNetwork documentation.
Casper van Donderen [Mon, 7 May 2012 09:10:29 +0000 (11:10 +0200)]
Doc: Modularize QtNetwork documentation.

This change moves the snippets and imagesto the modularized directories.

Change-Id: If14912692a7f72d7de345eaf88d9ec9752310fca
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoProperly implement a 'make docs' target for subdirs and apps/libs
Marius Storm-Olsen [Mon, 7 May 2012 11:54:52 +0000 (13:54 +0200)]
Properly implement a 'make docs' target for subdirs and apps/libs

Only call qdoc for projects which sets the QMAKE_DOCS variable to
point to a qdocconf file.

Exclude examples/ and tests/ from the qdoc run, by adding
    no_docs_target
to CONFIG for those projects.

Change-Id: Ic856c8f19db59309302d0602b3e99735609e525a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoQArrayData: Suppress MSVC warnning.
Debao Zhang [Sat, 5 May 2012 16:44:05 +0000 (09:44 -0700)]
QArrayData: Suppress MSVC warnning.

Change-Id: I3b8090d9d3f1294d76ff1cc3503c73e90cd91b40
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoAdd some extra tests to tst_QString to ensure the encoding is correct
Thiago Macieira [Wed, 25 Apr 2012 15:59:45 +0000 (17:59 +0200)]
Add some extra tests to tst_QString to ensure the encoding is correct

This also tests by consequence that the behaviour of QByteArrays
containing NULs is consistent. Right now, that means the QByteArray
processing stops at the NUL, which is the same behaviour as if a
pointer to the byte array's data were used. (it's what happens if
there's no QByteArray overload and the const char* one is called)

Change-Id: If56a822f95866e8cb5b153d07b48198bb83fb386
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange QStringBuilder to use UTF-8 too
Thiago Macieira [Wed, 25 Apr 2012 15:55:36 +0000 (17:55 +0200)]
Change QStringBuilder to use UTF-8 too

This commit completes the previous commit so that both QString and
QStringBuilder now operate on UTF-8 input.

A small fix was required in QStringBuilder: an if clause isn't enough
to separate the two append versions. Since there are no QString
functions that append to char*, if we're converting to a QByteArray,
we need to go through a QString first in a separate function.

Change-Id: Ic503340c5d0c32d420c90c91cc2e0fc1ae9230f3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange QString's default codec to be UTF-8
Thiago Macieira [Mon, 23 Apr 2012 14:39:13 +0000 (16:39 +0200)]
Change QString's default codec to be UTF-8

This is a crude change, not the most efficient way. I'll clean up and
make it prettier later on, when I've had the chance to optimise the
UTF-8 codec too.

Change-Id: I78e30e8d3bddf6ad0210c9c4cedb9a7ce63d1a7d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtDBus]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtDBus]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I052a3412a568ad639f2bf169b4491b56dddff1c7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix encoding mismatches in tst_QSqlQuery
Thiago Macieira [Sun, 6 May 2012 21:48:46 +0000 (14:48 -0700)]
Fix encoding mismatches in tst_QSqlQuery

The file has been UTF-8 encoded for years, which means that the line:
    QString longerBLOB( "abcdefghijklmnopqrstuvxyz¿äëïöü¡  " );

Loaded a mojibake into QString. Then, this data was stored as a blob
in the database by calling longerBLOB.toLatin1() (a QByteArray), and
reloaded for check using toString().

Once the QString default codec changes to UTF-8, the mojibake would
get fixed, and the test would fail. Make sure it doesn't happen.

Change-Id: If12d6124c973e4a1c1b7978d90fffb9aa5545c66
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQuery the screen physical size rather than assuming fixed dpi of 96
Sean Harmer [Tue, 24 Apr 2012 13:33:23 +0000 (14:33 +0100)]
Query the screen physical size rather than assuming fixed dpi of 96

Change-Id: I405e8d1cfbf7f0607f8525f9c8c93053109478d9
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoVarious minor fixes for qdoc warnings.
Richard Moore [Sun, 6 May 2012 13:28:31 +0000 (14:28 +0100)]
Various minor fixes for qdoc warnings.

Change-Id: I54c5ab6e1bfb1816bb510be9e2bfa1e3362faa36
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFix more qdoc warnings in qtnetwork.
Richard Moore [Sun, 6 May 2012 17:03:02 +0000 (18:03 +0100)]
Fix more qdoc warnings in qtnetwork.

Change-Id: Ibfac6236e9f68b41e34e67ef03cfd590582439be
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd default value for getters in QJsonValue
Liang Qi [Tue, 20 Mar 2012 06:07:03 +0000 (07:07 +0100)]
Add default value for getters in QJsonValue

Done-with: Debao Zhang <dbzhang800@gmail.com>
Change-Id: I3ddd8dd89dc75d91ac9977bf9b6eb3174d7669e4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix typos in bcd477e0bc48b
David Faure [Sat, 5 May 2012 23:14:08 +0000 (01:14 +0200)]
Fix typos in bcd477e0bc48b

Change-Id: Ia1981c86f799a749aa8fab5cdd8f6563b2ebe77f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoQDoc: Examples: Move list of files/images to bottom of output.
Casper van Donderen [Fri, 4 May 2012 18:51:06 +0000 (20:51 +0200)]
QDoc: Examples: Move list of files/images to bottom of output.

Change-Id: Ie3b98489d80360bae21ee062bf6a11ea3ee74c4d
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoMake sure we export the non-inline qMalloc & friends functions
Thiago Macieira [Thu, 3 May 2012 15:22:07 +0000 (17:22 +0200)]
Make sure we export the non-inline qMalloc & friends functions

If QtCore is built with Qt 5.0 API, the Q_CORE_EXPORT does not appear
anywhere and these functions wouldn't get exported, despite being
defined. So make sure that they get the Q_CORE_EXPORT attribute.

Change-Id: I0684ea1b9ad634c13dca12c97683032e44f6a290
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoPublish the fact of whether Qt was built with hidden visibility.
Stephen Kelly [Wed, 2 May 2012 22:20:11 +0000 (00:20 +0200)]
Publish the fact of whether Qt was built with hidden visibility.

Change-Id: Iaf1a6495ee96859af9c5c25a54ea1fc463910cd3
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtSql]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtSql]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Icb3ab0e1f4f3173563f3de36115b5457cf1ba856
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoPlace the plugin metadata into special sections for Mac and Win
Lars Knoll [Mon, 30 Apr 2012 11:22:51 +0000 (13:22 +0200)]
Place the plugin metadata into special sections for Mac and Win

The plugin metadata is placed into a special section in the
object file on ELF systems to allow finding it fast. Place
the data into a special section on Mac and Windows as well,
even though we don't have Mach-O or COFF parsers available
yet.

This will allow us to add the Mach-O and COFF parsers as a pure
optimization later on.

Task-number: QTBUG-25054
Change-Id: I376d5443ede715aee2c68fb62d24afdbf66e5685
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQNetworkProxyFactory: check all the proxy environment variables
Adrien Bustany [Wed, 25 Apr 2012 11:23:01 +0000 (14:23 +0300)]
QNetworkProxyFactory: check all the proxy environment variables

QNetworkProxyFactory used to check only for the http_proxy environment
variable in systemProxyForQuery. This patch makes it look as well in
https_proxy, ftp_proxy and all_proxy. http_proxy is still used as a
fallback value.

Change-Id: I7934af70d191cd17dbce3b3789260ae1a8332986
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoEnable specifying raw headers for the request
Shane Kearns [Tue, 24 Apr 2012 14:57:24 +0000 (15:57 +0100)]
Enable specifying raw headers for the request

Use "--headers=file" where the file contains the raw headers to send.
This is useful for replaying requests from log files.

Change-Id: I3bbe582d96fc9797f692a0d5772e8164f8265ce0
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoUse reference count to close down idle network session
Shane Kearns [Fri, 27 Apr 2012 18:31:37 +0000 (19:31 +0100)]
Use reference count to close down idle network session

QNetworkAccessManager was using the AutoCloseConnection property
of QNetworkSession to close it when idle. However this property is
only implemented for polling engines and not event driven engines.

Instead, release the network session reference.
If another request comes in, it will be resurrected from the shared
session weak reference.
If not, then after 2 minutes when the connection caches are flushed
the ref count will reach zero and cause the QNetworkSession to be
destroyed (which closes it)

Task-number: QTBUG-15812
Change-Id: I2963bdf13fb02e3ac269489ea463669142f3c5f3
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoDocument dependency of bearer management on network interface
Shane Kearns [Fri, 4 May 2012 09:47:50 +0000 (10:47 +0100)]
Document dependency of bearer management on network interface

Task-number: QTBUG-21243

Change-Id: I494b751589f2efcb5101c056ac24ef82df9aa746
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove not present networks from QNetworkInterface::allInterfaces
Shane Kearns [Fri, 4 May 2012 10:18:38 +0000 (11:18 +0100)]
Remove not present networks from QNetworkInterface::allInterfaces

Windows 7 accumulates networks over time with the status
"not present". This is so it can remember whether a given network
was a public, home or work network next time you use it.
By default, these networks are not returned when enumerating
network interfaces, but we specified a flag to request all networks.
These networks are generally not useful so use the default behaviour
of not reporting them.

Task-number: QTBUG-18824
Change-Id: I4edc4cea83a0e97a88ac649b7d8af95a8a600b89
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoIntroduce Arch Linux specific link line to pi mkspec
Donald Carr [Fri, 4 May 2012 21:38:12 +0000 (21:38 +0000)]
Introduce Arch Linux specific link line to pi mkspec

Change-Id: I77c99a2f5e25c28ad2d4a13e3b56d3603cd5bb64
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoqdoc: Fixed minor version number in DITA XML
Martin Smith [Fri, 4 May 2012 13:51:20 +0000 (15:51 +0200)]
qdoc: Fixed minor version number in DITA XML

The DITA XML didn't contain the correct
QML Module version mumber in the imports
statement.

Change-Id: I22b75facc1396c5adea88be49c86fff11f19f27b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoImplement QWindow::resize(int, int) by calling to resize(QSize).
Friedemann Kleint [Fri, 4 May 2012 13:31:59 +0000 (15:31 +0200)]
Implement QWindow::resize(int, int) by calling to resize(QSize).

The old implementation called setGeometry() clearing the
positioning policy flag.

Change-Id: If8226f86481318e772fba37c2c195037c3d955b0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd missing include file.
Jędrzej Nowacki [Fri, 4 May 2012 13:23:33 +0000 (15:23 +0200)]
Add missing include file.

qfile_p.h is depending on qfile.h

Change-Id: I8b021baaf517a0236a062ef031a33bd8e2915101
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReuse QArray initializer macro in QByteArray
Jędrzej Nowacki [Tue, 24 Apr 2012 12:22:59 +0000 (14:22 +0200)]
Reuse QArray initializer macro in QByteArray

Change-Id: Ieb12ee290846dce88f2ea9fbf943103899337e0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReplace QByteArrayData class by typedef.
Jędrzej Nowacki [Tue, 24 Apr 2012 10:25:07 +0000 (12:25 +0200)]
Replace QByteArrayData class by typedef.

QByteArrayData was binary compatible with QArrayData, but we do not
need a separate class, QArrayData should be sufficient. Preferably we
would use QTypedArrayData<char> but it is not POD, therefore it can
not be initialized with {} syntax.

Change-Id: I1edd7b4f236b06d8f2dbfd8a37a3f5699b6a2c07
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoQDoc: Generate unique ids for qmlMethods.
Casper van Donderen [Fri, 4 May 2012 12:51:53 +0000 (14:51 +0200)]
QDoc: Generate unique ids for qmlMethods.

Also delete unused function.

Change-Id: I8c3590d17c823bc27dcb9d9e73b7b812e078d33b
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoAvoid glyph rendering with FT when not needed
Jiang Jiang [Fri, 2 Mar 2012 13:22:10 +0000 (14:22 +0100)]
Avoid glyph rendering with FT when not needed

If we only need to access the font metrics (like in scenegraph) for
layout, we don't need to render glyphs with FreeType at all.

Increase cached linearAdvance to 22 bits so that no overflow will
happen: FreeType returns 16.16 fixed point linearHoriAdvance, but
QFixed is 26.6, we store

    glyph->linearAdvance = linearHoriAdvance >> 10

Apparently 'short' is not enough since it's only 16 bits.

Change-Id: Id14eafa19f01a687de11997526281f9e7e860482
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoLoad resources in in QTextDocument correctly
Lars Knoll [Fri, 27 Apr 2012 20:05:32 +0000 (22:05 +0200)]
Load resources in in QTextDocument correctly

In Qt 4, we loaded resources through the QTextEdit or
QTextControl if they were the parent of the document.
Modularization for Qt 5 broke this, as we can't cast
the parent to a QTextEdit anymore.

The fix is to make the loadResource() methods in QTextControl
and QTextEdit invokable and discover and invoke them at
runtime on the parent object.

Task-number: QTBUG-25116
Change-Id: Iba04bc16849b0c5ddcd275f12d1a386a8fe591bf
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [platformsupport]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [platformsupport]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Ie1a4e5ceca21c31e7357f28b90abc9129b122104
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd an assert simplifying debugging.
Jędrzej Nowacki [Thu, 26 Apr 2012 10:03:29 +0000 (12:03 +0200)]
Add an assert simplifying debugging.

Statics should not be deleted, the assert shows a nicer debug
information then a segmentation fault.

Change-Id: I9eedbfa966d7865fd7bb1e130c79e40bae3526cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoremoved unneccessary wince ifdef
Bjoern Breitmeyer [Fri, 4 May 2012 12:06:42 +0000 (14:06 +0200)]
removed unneccessary wince ifdef

Change-Id: I4b057c0ae266baae3e8c3675656abb361bfcacf4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoStub out QSharedMemory and QSystemSemaphore for Android.
Robin Burchell [Tue, 1 May 2012 22:56:22 +0000 (00:56 +0200)]
Stub out QSharedMemory and QSystemSemaphore for Android.

Android does not support regular SysV shm, we'll need to write our own
implementations.

Change-Id: I2817f64b36512b965b012388a667d08935828c83
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoGuard some pthread API with the appropriate POSIX check, or Android.
Robin Burchell [Tue, 1 May 2012 19:22:20 +0000 (21:22 +0200)]
Guard some pthread API with the appropriate POSIX check, or Android.

Android does not support some parts of POSIX. It's also unfortunately not
POSIX-compliant, meaning we need to guard things like pthread_cancel.

Change-Id: I2979eb5579c822f4f5ba27bcc29e118b908e8bdc
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoWindowmodality-test: Compile with Qt 4.8.
Friedemann Kleint [Fri, 4 May 2012 11:15:02 +0000 (13:15 +0200)]
Windowmodality-test: Compile with Qt 4.8.

Make it possible to shadow-build using Qt 4.8  for comparison.

Change-Id: I1a18b7f1d03b11f0420aab14455e2c53d1afd6ba
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoProperly guard rand_r use with _POSIX_THREAD_SAFE_FUNCTIONS for Android.
Robin Burchell [Tue, 1 May 2012 18:48:17 +0000 (20:48 +0200)]
Properly guard rand_r use with _POSIX_THREAD_SAFE_FUNCTIONS for Android.

Android does not support this, or other thread-safe functions.

Change-Id: Id2a918f83e6138795196c45f89613c5b46911901
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoEnable some SQLITE extensions by default
Rafael Roquetto [Mon, 30 Apr 2012 12:24:34 +0000 (14:24 +0200)]
Enable some SQLITE extensions by default

Enable SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE
by default on all platforms. These options were previously enabled in Ubuntu,
Nokia N9 and in some mobile devices.

Change-Id: I5b3d2d9a683916216058ca94ec82957bd8cacdb0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoAdd Android to conditionals around langinfo.h usage.
Robin Burchell [Wed, 2 May 2012 11:31:48 +0000 (13:31 +0200)]
Add Android to conditionals around langinfo.h usage.

Despite being mandated by POSIX, Android does not support this.

Change-Id: I3da42ff9b3336cb6657692a9eb70dd3118ac1756
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agostop ignoring unassigned codepoints
Konstantin Ritt [Thu, 26 Apr 2012 16:36:34 +0000 (19:36 +0300)]
stop ignoring unassigned codepoints

in Unicode 5.1, it was clarified that unassigned codepoints normally
should not be excluded from the process; moreover, unassigned codepoints
assumed to be starters in decomposition by default

Change-Id: Ic4a61ec3759ee62b6843c81045e1d611d0684ead
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoadd support for non-BMP ligatures
Konstantin Ritt [Thu, 26 Apr 2012 16:29:08 +0000 (19:29 +0300)]
add support for non-BMP ligatures

> http://www.unicode.org/versions/Unicode5.2.0/
D. Character Additions:
There are three new characters in the newly-encoded Kaithi script that will
require changes in implementations which make hard-coded assumptions about
composition during normalization. Most new characters added to the standard
with decompositions cannot be generated by the operations toNFC() or toNFKC),
but these three can. Implementers should check their code carefully
to ensure that it handles these three characters correctly.
U+1109A KAITHI LETTER DDDHA
U+1109C KAITHI LETTER RHA
U+110AB KAITHI LETTER VA

UCD 6.1 adds two more of them:
U+1112E CHAKMA VOWEL SIGN O
U+1112F CHAKMA VOWEL SIGN AU

Change-Id: I781a26848078d8b83a182b0fd4e681be2a6d9a27
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoUse QFile::{encode,decode}Name to deal with QT_PLUGIN_PATH
Thiago Macieira [Wed, 2 May 2012 13:36:35 +0000 (15:36 +0200)]
Use QFile::{encode,decode}Name to deal with QT_PLUGIN_PATH

Since it deals with paths, let's use the proper path-handling
functions.

Change-Id: I896d2c472dfd675e9ff247657447178702f178be
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoSlightly improve the query encode/decode test in QUrl
Thiago Macieira [Fri, 4 May 2012 10:40:28 +0000 (12:40 +0200)]
Slightly improve the query encode/decode test in QUrl

Show that nothing is changed either way, regardless of the encoding
flags used.

Change-Id: I31fba5f87eae777d4b708ab789b32169004bcbcc
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAllow the QPA plugin arguments to contain non-ASCII.
Thiago Macieira [Wed, 2 May 2012 12:47:30 +0000 (14:47 +0200)]
Allow the QPA plugin arguments to contain non-ASCII.

Who knows what we might need them for in the future?

Change-Id: Ic68e04aea6cb26afb0ed98684bbb37a62c111638
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoUse QFile::encodeName to encode a file name on Unix
Thiago Macieira [Wed, 2 May 2012 12:46:10 +0000 (14:46 +0200)]
Use QFile::encodeName to encode a file name on Unix

This usually matches QString::toLocal8Bit, not toAscii.

Change-Id: I7b1c3e500be8265de0710cf36ca407c8b3f31edd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix QUrl::toString(StripTrailingSlash) to not turn file:/// into file:
David Faure [Thu, 3 May 2012 16:49:46 +0000 (18:49 +0200)]
Fix QUrl::toString(StripTrailingSlash) to not turn file:/// into file:

It should only strip one slash (as the name indicates), and not if the
path is just "/".

Change-Id: I133a81977241de77a49d1d1559143d30e0bd52f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd setCursor API to QWindow
Laszlo Agocs [Thu, 3 May 2012 11:58:25 +0000 (14:58 +0300)]
Add setCursor API to QWindow

Change-Id: Id430ea9c94475356c9367a135f678f5f9ef795fc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix compiler warning
Olivier Goffart [Mon, 30 Apr 2012 11:15:15 +0000 (13:15 +0200)]
Fix compiler warning

qurlrecode.cpp:481:24: warning: ‘action’ may be used uninitialized in
this function [-Wmaybe-uninitialized]

Change-Id: I638b65218d1875667e2c60a5720ecda87202b82f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAlways return uiLanguages in bcp47 format
Lars Knoll [Wed, 2 May 2012 12:23:34 +0000 (14:23 +0200)]
Always return uiLanguages in bcp47 format

The old code didn't convert the uilanguages
coming from the system locale to bcp47 format,
leading to QLocale().uiLanguages() and
QLocale("en_US").uiLanguages() returning
things in an inconsistent format. Now it always
returns bcp47 format (ie. Language and Country
separated by a hyphen).

Change-Id: I40d3442255e6e8daa4723f7b3fc13829c9764eb1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
12 years agoRemove insignification from tst_QOpenGL
Miikka Heikkinen [Fri, 4 May 2012 07:47:49 +0000 (10:47 +0300)]
Remove insignification from tst_QOpenGL

This test is passing for Windows now in CI due to recent fixes, so
remove the insignification.

Change-Id: Ib74aea443c4a66c9bf743d88e15d9f27f9ac2fe4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoPort the QTextStream / QDebug functions away from fromAscii
Thiago Macieira [Wed, 2 May 2012 11:29:54 +0000 (13:29 +0200)]
Port the QTextStream / QDebug functions away from fromAscii

No behaviour change since fromAscii (temporarily, at this point) means
fromUtf8.

Change-Id: I0e4d3ccfac7b5beaaaececb9f088324ee4838f84
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [other]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [other]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Ib1eaf42679ab5db4005192c3d00ba79e43edfcca
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't flush WA_DontShowOnScreen widgets.
Morten Johan Sorvig [Fri, 4 May 2012 10:28:26 +0000 (12:28 +0200)]
Don't flush WA_DontShowOnScreen widgets.

QBackingStore::flush expects that windows have gotten expose
events before flush is called. Not on screen -> no expose events ->
don't call flush.

Change-Id: Id868888566fe672939f3c5775f9f371fb3240ee8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QPA plugins]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QPA plugins]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I4aef078ea87ecd3699de107d1e9352d9fb6d6e39
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtTest]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtTest]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I6f3fa6a06ed037f3a98387958ba7ab18c3e04977
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtOpenGL]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtOpenGL]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I6ea46cd6dfed75afc253fa2b4e3f1789bdad1d4e
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtNetwork]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtNetwork]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I94cc301ea75cc689bcb6e2d417120cf14e36808d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoChange QString::toAscii to toUtf8 in the embedded filename in XBM.
Thiago Macieira [Thu, 3 May 2012 15:46:52 +0000 (17:46 +0200)]
Change QString::toAscii to toUtf8 in the embedded filename in XBM.

Change-Id: Iea32f30ac71b35c2792e2523400811fa54c804dc
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtGui]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtGui]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I2850033159508ebb1ff7564e15b99a146dbee94c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtCore]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtCore]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I38f97ad379deafebef02c75d611343ca15640c8a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoMake the event notification on Windows be mandatory in all dispatchers
Thiago Macieira [Tue, 3 Apr 2012 13:36:32 +0000 (10:36 -0300)]
Make the event notification on Windows be mandatory in all dispatchers

This way, QWinEventNotifier will work on all Windows systems, not just
with the default event dispatcher. Other dispatchers (other than
QWin32EventDispatcher) are permitted, so the class should not abort just
because of that.

If a dispatcher really doesn't want to implement this, they need to
implement the virtuals to do nothing, possibly print a warning.

Change-Id: I2c132bcde95b9d5941c8906a0fcd2ad964087772
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoWindows 7 - fix nativewifi bearer plugin
Shane Kearns [Fri, 4 May 2012 08:13:40 +0000 (09:13 +0100)]
Windows 7 - fix nativewifi bearer plugin

The plugin code only handled the 2 events from windows XP, while
there are more events defined on vista/7. As the scan complete event
was being ignored, updates did not complete.

Task-number: QTBUG-24503
Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoPass network session to http delegate
Shane Kearns [Fri, 27 Apr 2012 15:43:28 +0000 (16:43 +0100)]
Pass network session to http delegate

This functionality was in Qt4, and apparently lost in the
QNetworkAccessHttpBackend -> QNetworkReplyHttpImpl change

Change-Id: Ia354cfd2c10808a6543173ec017d911f1696e7fb
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoWindows: Fix Vista style for use with QProxyStyle.
Friedemann Kleint [Fri, 4 May 2012 07:11:13 +0000 (09:11 +0200)]
Windows: Fix Vista style for use with QProxyStyle.

Cleanup the treeview helper window in case XP style cleans
the handle map.
This fixes the drawing of the PE_IndicatorBranch primitives
in Qt Creator.

Task-number:  QTBUG-25395
Change-Id: Iba561709e3d4032a59690c7b9163fb69bfa98619
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdd mkspecs for 32-bit Mac OS X builds.
Morten Johan Sorvig [Thu, 3 May 2012 10:42:16 +0000 (12:42 +0200)]
Add mkspecs for 32-bit Mac OS X builds.

Add mkspecs/macx-clang-32
Add mkspecs/macx-g++-32
Add mkspecs/common/clang-mac.conf

Skip the rest of the Mac mkspecs (icc, llvm, g++40,
g++42, builder, Xcode, xlc) pending a cleanup where
we determine which ones to keep.

Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCompile.
Morten Johan Sorvig [Thu, 3 May 2012 10:29:22 +0000 (12:29 +0200)]
Compile.

Clang is picky about the missing QT_FASTCALL and
cant't find the base fetchPixel/storePixel template
function.

Change-Id: I7c0c14835b3d428f8f95961dc603d809511d7165
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove "file qmake"-based arch detection.
Morten Johan Sorvig [Thu, 3 May 2012 10:27:53 +0000 (12:27 +0200)]
Remove "file qmake"-based arch detection.

Change-Id: I0b6b66eb439c7f0f566b74cc3da0726a5ecbac34
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove all usages of "arch" CFLAGS on Mac.
Morten Johan Sorvig [Thu, 3 May 2012 08:50:01 +0000 (10:50 +0200)]
Remove all usages of "arch" CFLAGS on Mac.

Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS
and OBJECTIVE_CFLAGS. Delete the arch prf files.

32/64 bit arch selection will be made using a different
mechanism in Qt 5. Universal builds are not supported.

Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMake cupsTempFile member unconditianol.
Christoph Schleifenbaum [Thu, 3 May 2012 12:10:32 +0000 (14:10 +0200)]
Make cupsTempFile member unconditianol.

QPdfEngine has to have the same member everywhere. Otherwise
QPdfEngine and QPdfPrintEngine are compiled with different flags
(-DQT_NO_CUPS) -> QString cupsTempFile is only in QPdfEnginePrivate
in one lib -> crash.

Task-number: QTBUG-25553

Change-Id: I1d23bd14b8e68c212225ac773675a3b1bd2ca6cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRename QAbstractSocket::PauseOnNotify -> PauseOnSslErrors
Shane Kearns [Mon, 30 Apr 2012 18:14:06 +0000 (19:14 +0100)]
Rename QAbstractSocket::PauseOnNotify -> PauseOnSslErrors

Although we created an enum for pause modes to make 5.x binary
compatible with 5.0, the enum value is not well named.
In 5.1, we propose to add PauseOnProxyAuthentication to the enum.
PauseOnNotify is not clear what it means, while PauseOnSslErrors is.

Any new notification in a minor release would need a new enum value
otherwise applications would get pauses they did not expect.

Task-number: QTBUG-19032
Change-Id: I4dbb7467663b37ca7f0551d24a31bc013968bedc
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix windows cert fetcher if site presents full chain
Shane Kearns [Fri, 27 Apr 2012 19:05:05 +0000 (20:05 +0100)]
Fix windows cert fetcher if site presents full chain

If a website presents the complete certificate chain in the handshake
i.e. site -> intermediate CA -> root CA then openssl gives
a different error (SelfSignedCertificateInChain)

Because of this windows feature, that either means the site is
signed by an untrusted CA, or the CA trust status is unknown because
we don't have the root cert in the cert store.

In any case, calling the windows verification function results
in a trusted chain & the root being added to the cert store.

Task-number: QTBUG-24827
Change-Id: I2663ea2f86cd0b4dfde105d858ec1b39a340c1f6
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoMove QSocketNotifier data members to a private class
Shane Kearns [Fri, 20 Apr 2012 17:25:31 +0000 (18:25 +0100)]
Move QSocketNotifier data members to a private class

This is a binary incompatible change to allow future changes
to QSocketNotifier to be possible in a binary compatible way.

Change-Id: If90f3393e84edd3b1ac4d4132fa8e59b6b87a8ec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDocument new APIs in 5.0
Shane Kearns [Thu, 3 May 2012 17:10:19 +0000 (18:10 +0100)]
Document new APIs in 5.0

The \since 5.0 directive was missing from many places.

Task-number: QTBUG-24001
Change-Id: I191ba8891ae66d78f923164bcab2fccb16eabef9
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDocument deprecated APIs in QSsl
Shane Kearns [Thu, 3 May 2012 12:57:22 +0000 (13:57 +0100)]
Document deprecated APIs in QSsl

Task-number: QTBUG-24001

Change-Id: I8d0980bd5418e9324d0a0fe55c00b432c0a98fb1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDocument QSslCertificate deprecated functions
Shane Kearns [Wed, 2 May 2012 16:35:00 +0000 (17:35 +0100)]
Document QSslCertificate deprecated functions

With the new functions linked

Task-number: QTBUG-24001
Change-Id: I9fd2de746a6342a1f4f182189e7f2529f092c003
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove some remnants of Symbian code in src/gui/painting
Thiago Macieira [Fri, 30 Dec 2011 16:43:43 +0000 (14:43 -0200)]
Remove some remnants of Symbian code in src/gui/painting

Those files don't exist anymore. They were removed in
d1a2b53aaf76f48e195260a415ca406fa1ef01a2.

Change-Id: Id20203c5671eec8bff74fb76b8baf6b2fecb7c5b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRevert "[SIC] Make non-const the QRegExp methods that modify the internals"
Thiago Macieira [Thu, 3 May 2012 10:42:36 +0000 (12:42 +0200)]
Revert "[SIC] Make non-const the QRegExp methods that modify the internals"

This reverts commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848. The
source-incompatible change proved to be more trouble than it's
worth. Too much intrusion into the porting effort of applications for
no appreciable gain, especially considering that we have a replacement
class.

Change-Id: Ia99a2360390a2062a8ddb6e12c8f2099287a2704
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-May/003562.html
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agotroll.no changed its NS record configuration. Adapt.
Thiago Macieira [Thu, 3 May 2012 14:07:08 +0000 (16:07 +0200)]
troll.no changed its NS record configuration. Adapt.

Change-Id: I62d778da67a463da765b6ad70774449560105d7d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix tabs/whitespaces
Yuchen Deng [Mon, 30 Apr 2012 12:57:39 +0000 (20:57 +0800)]
Fix tabs/whitespaces

Change-Id: I4db24b703c69ce99f529c84248d9fe4a19a60a03
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMerge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Lars Knoll [Thu, 3 May 2012 13:43:10 +0000 (15:43 +0200)]
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master

12 years agoRevert "Don't use the pri depends line for link dependencies."
Stephen Kelly [Fri, 27 Apr 2012 14:17:22 +0000 (16:17 +0200)]
Revert "Don't use the pri depends line for link dependencies."

This reverts commit df43b9a06a73759ba74f23d9c3e91bd0347d1026.

Using the same depends information as QMake provides adds a lot of
convenience for users, and is mostly 'correct' from a CMake
point of view anyway.

Change-Id: I8f2a2f74a687c25a0dedcc491ef72ddb5b136090
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRemove Linux check for fdatasync().
Robin Burchell [Wed, 2 May 2012 14:45:03 +0000 (16:45 +0200)]
Remove Linux check for fdatasync().

Android lacks an fdatasync() implementation. Upstream sqlite has also removed
this part of the ifdef.

Change-Id: I656f1b67e8e8880308372a90b100fe9b23f96455
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoOptimise windows cert fetching and fix test case.
Shane Kearns [Wed, 18 Apr 2012 14:33:24 +0000 (15:33 +0100)]
Optimise windows cert fetching and fix test case.

If we're not going to verify the peer, or we know in advance that
windows won't have a CA root then don't ask it to verify the
certificate chain.
The test case started failing in CI when the windows cert fetcher
was integrated due to timing change. I've relaxed the timing
requirement of the test to avoid it being unstable.

Task-number: QTBUG-24827
Change-Id: I694f193f7d96962667f00aa01b9483b326e3e054
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoPull in netinet/in.h. Required for definition of sockaddr_in and friends.
Robin Burchell [Wed, 2 May 2012 12:26:40 +0000 (14:26 +0200)]
Pull in netinet/in.h. Required for definition of sockaddr_in and friends.

Change-Id: I3b1c7dc1c08ec54f5537b6019dc2554763538cfd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoWork around std::wstring not being defined on Android.
Robin Burchell [Tue, 1 May 2012 18:35:31 +0000 (20:35 +0200)]
Work around std::wstring not being defined on Android.

libstdc++ requires wchar.h (which bionic provides), but it also requires
additional functionality which bionic does not provide, thus, std::wstring
proper basically doesn't exist.

Provide a compatibility shim so we can keep API intact. This feature existed in
a similar guise in the past, but was removed in
d868c9945a188d6ad22e0b7d6d24ac7fca00ab4e.

Change-Id: I6cab6f41d04ad9dde97e3ce73506f9d8a42043fb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd some missing includes.
Stephen Kelly [Wed, 2 May 2012 22:20:42 +0000 (00:20 +0200)]
Add some missing includes.

There is a #include <QStringList> line wrapped in
QT_DEPRECATED_SINCE(5, 0).

Change-Id: I766848dfcc3bd765c57626a3d70f492ac1219091
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoImplement QLocalServer::socketOptions on windows
Shane Kearns [Wed, 2 May 2012 14:32:09 +0000 (15:32 +0100)]
Implement QLocalServer::socketOptions on windows

Tested manually using the localfortuneserver example and multiple
login sessions. The linux autotest isn't suitable for windows due
to pipe permissions not appearing in the filesystem.

Task-number: QTBUG-25147
Change-Id: I5ea4db81d1870dc45bd483fa8d0b06afede3b722
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoMerge remote-tracking branch 'origin/api_changes'
Lars Knoll [Thu, 3 May 2012 08:18:36 +0000 (10:18 +0200)]
Merge remote-tracking branch 'origin/api_changes'

Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qlogging.cpp
src/gui/kernel/qguiapplication.h
src/gui/kernel/qwindow.cpp
src/gui/kernel/qwindow.h
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp

Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e

12 years agoMSVC: Fix link warning if ship qt library without pdb files
Yuchen Deng [Mon, 30 Apr 2012 12:56:41 +0000 (20:56 +0800)]
MSVC: Fix link warning if ship qt library without pdb files

qtmaind.lib(qtmain_win.obj):-1: warning: LNK4099: PDB 'vc100.pdb' was
not found with 'qtmaind.lib(qtmain_win.obj)';
linking object as if no debug info

Change-Id: I5d515a240e917f5747ec8ca7dabde1cd1a1b14de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSkip tst_QOpenGL::openGLPaintDevice() if wrong openGL version.
Miikka Heikkinen [Wed, 2 May 2012 07:49:51 +0000 (10:49 +0300)]
Skip tst_QOpenGL::openGLPaintDevice() if wrong openGL version.

It seems that this case is failing on CI because OpenGL version,
so skip if OpenGL is not recent enough.

Task-number: QTBUG-24192
Change-Id: I543e7a092e5c107ee57cd9dce7dc5c890a0315cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoWindows: Fix QWindowsNativeFileDialogBase::directory()
Friedemann Kleint [Thu, 3 May 2012 07:59:34 +0000 (09:59 +0200)]
Windows: Fix QWindowsNativeFileDialogBase::directory()

The item was never initialized.

Change-Id: Iaf404c7f601713886c1c1346cc145460e7e89171
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>