profile/ivi/qtbase.git
13 years agoFix building the OpenVG graphicssystem on Linux with static libs
Bernhard Rosenkraenzer [Fri, 10 Jun 2011 16:08:44 +0000 (18:08 +0200)]
Fix building the OpenVG graphicssystem on Linux with static libs

Without this, building OpenVG would fail because Q_OPENVG_EXPORT wasn't
defined at all, causing it to be treated as a variable name

Merge-request: 1256
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 8680ced782c5e225b2e15c50c05493a23410b119)

Change-Id: I0da36af8cdcf411325fad25fa5c4d2ab7764c0ee
Reviewed-on: http://codereview.qt-project.org/4573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoupdate gitignore
Oswald Buddenhagen [Fri, 13 May 2011 09:54:13 +0000 (11:54 +0200)]
update gitignore

(cherry picked from commit ba564e089134980200c1c71879f2474135bee5fa)

Change-Id: Id3a83228d178cefbec21b07f7e6439e3ea92b962
Reviewed-on: http://codereview.qt-project.org/4572
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoremove -fno-stack-protector
Oswald Buddenhagen [Fri, 13 May 2011 08:20:19 +0000 (10:20 +0200)]
remove -fno-stack-protector

there is no need to disable stack protector unless one uses an ancient
version of gcc.
taken from kubuntu.

(cherry picked from commit 30211e6847007bf375f60f62f5806b05cec810c3)

Change-Id: Idd74823176a63002cc0f6511adc6a981bef79df9
Reviewed-on: http://codereview.qt-project.org/4571
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix make confclean
Anders Bakken [Tue, 10 May 2011 18:39:35 +0000 (11:39 -0700)]
Fix make confclean

Merge-request: 1227
Reviewed-by: ossi
(cherry-picked from commit 792b4b500ab740f89db5586791105ff13778b87f)

Change-Id: Id5ec2cfb228691c8483bf1d9e0c6a763aa649217
Reviewed-on: http://codereview.qt-project.org/4570
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoRetain ABI and API compatibility when Qt is built with EGL.
Michał Zając [Fri, 13 May 2011 08:39:34 +0000 (10:39 +0200)]
Retain ABI and API compatibility when Qt is built with EGL.

Author: Felix Geyer <debfx-pkg@fobos.de>

Merge-request: 1230
Reviewed-by: ossi
(cherry picked from commit dcbd920daf92d80302633f73dd8324437005a10e)

Change-Id: I8d2dc64a2785b4940d06c9493a3ba0f96a487f9b
Reviewed-on: http://codereview.qt-project.org/4569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix -no-gui
Bernhard Rosenkraenzer [Mon, 9 May 2011 09:34:23 +0000 (11:34 +0200)]
Fix -no-gui

-no-gui still tried to build the graphicssystem and inputmethod
plugins, both of which require QtGui

Merge-request: 1215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit f0ae4f8ebdc6b7c50c163cfa29e686f3f87c8ba5)

Conflicts:
src/plugins/plugins.pro

Change-Id: I74ced5817989604f3beebf1fcc60eabaf1fd8115
Reviewed-on: http://codereview.qt-project.org/4568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix compilation with QT_NO_*
Tasuku Suzuki [Mon, 2 May 2011 09:23:47 +0000 (11:23 +0200)]
Fix compilation with QT_NO_*

Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d)

Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp

Change-Id: I8ff647b1e331b0c855a8f63d16a4f3cacd8e436c
Reviewed-on: http://codereview.qt-project.org/4567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agodon't crash when destroying the shortcuts
Konstantin Ritt [Tue, 30 Aug 2011 08:34:31 +0000 (12:34 +0400)]
don't crash when destroying the shortcuts

as shortcutDestroyed(..) modifies the shortcuts list.
disconnect from shortcutDestroyed() first, or operate on a detach()-ed list

this was uncovered by QList::removaAll() optimization patch.

(cherry picked from commit e95de30977291a251660f72baa84b5ff244711fb)

Change-Id: Ie0b371c54458ce85f4d36430de8080a5e78d8b7f
Reviewed-on: http://codereview.qt-project.org/4585
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agodon't crash when destroying codec list
Oswald Buddenhagen [Mon, 15 Aug 2011 16:10:02 +0000 (18:10 +0200)]
don't crash when destroying codec list

this was uncovered by rittk's don't-detach patch.

(cherry picked from commit cc98710df73a590c37dca19bd3aa9fcd9bbd5a92)

Change-Id: I2225e6a94e5562459d9c5fd27ac7c8e611b674fd
Reviewed-on: http://codereview.qt-project.org/4580
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoconfigure on Windows: Store result of V8 configuration
Kent Hansen [Fri, 9 Sep 2011 10:25:32 +0000 (12:25 +0200)]
configure on Windows: Store result of V8 configuration

Otherwise V8 won't be built (there's a contains()
check in src.pro).

Change-Id: Iba65e85baae1e80800e5ca0da49fde8958dfd659
Reviewed-on: http://codereview.qt-project.org/4524
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix a few memory leaks for QFontconfigDatabase
Jiang Jiang [Thu, 8 Sep 2011 15:38:56 +0000 (17:38 +0200)]
Fix a few memory leaks for QFontconfigDatabase

Change-Id: I015a9287f03d6965a77461d3e894de0492547cf3
Reviewed-on: http://codereview.qt-project.org/4480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
13 years agoUpdate V8
Aaron Kennedy [Fri, 9 Sep 2011 04:20:18 +0000 (14:20 +1000)]
Update V8

Add a "NativeMode" to V8 script compilation.

Change-Id: I73b087c9787ca7f961c2af89f45de2b8813ce1a5
Task-number: QTBUG-20344
Reviewed-on: http://codereview.qt-project.org/4500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agotests: use contains(QT_CONFIG,private_tests) consistently
Rohan McGovern [Thu, 8 Sep 2011 05:18:42 +0000 (15:18 +1000)]
tests: use contains(QT_CONFIG,private_tests) consistently

These tests used requires(contains(QT_CONFIG,private_tests)) in their
.pro file, but did not subtract themselves from their parent project
SUBDIRS when private_tests weren't enabled.

In the best case, this wastes a little time as qmake iterates over these
projects which won't be built.  In some worse esoteric cases, this may
break compilation or packaging.

Change-Id: I189c108ee9943b15114becf9d6b04f78dbabbe31
Reviewed-on: http://codereview.qt-project.org/4389
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
13 years agoqmake vcxproj generator: fix XML conversion for build events
Joerg Bornemann [Thu, 8 Sep 2011 15:44:05 +0000 (17:44 +0200)]
qmake vcxproj generator: fix XML conversion for build events

Task-number: QTBUG-20419

Change-Id: I52069e0beb2b39ec4a67e83de583efd2926c6611
Reviewed-on: http://codereview.qt-project.org/4484
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoAdd an SSE4.2 even simpler version of toLatin1
Thiago Macieira [Wed, 22 Dec 2010 18:52:48 +0000 (19:52 +0100)]
Add an SSE4.2 even simpler version of toLatin1

Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length
STRings with result in a Mask) which is added in SSE4.2 for
facilitating string operations. The "compare ranges" mode allows us to
search for characters outside the Latin 1 range and then use the
SSE4.1 PBLENDVB instruction to replace those with question marks.

Unlike previous SSE compare instructions, the PCMPxSTRx family allows
us to operate on unsigned 16-bit values. This saves us another
parallel add.

Reviewed-By: Samuel Rødal
(cherry picked from commit 45d2d36c9dbcbce403c78838ea52acd1ab111b68)

Change-Id: I0f9d864f9d19c0f0da43ccb6918dc28295074496
Reviewed-on: http://codereview.qt-project.org/4468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoCreate a function that merges the SSE common code
Thiago Macieira [Wed, 22 Dec 2010 18:52:18 +0000 (19:52 +0100)]
Create a function that merges the SSE common code

Reviewed-by: Samuel Rødal
(cherry picked from commit bb3bd601560132df769c32808ae0b36c56d1caab)

Change-Id: Icd7f661785a793effcd4d8cd08ffa8bb5a592cd9
Reviewed-on: http://codereview.qt-project.org/4467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoImprove toLatin1 x86 SIMD by using a new SSE4.1 instruction
Thiago Macieira [Wed, 22 Dec 2010 13:42:33 +0000 (14:42 +0100)]
Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction

The new instruction is PBLENDVB, which creates a result by selecting
bytes from one of two registers, depending on whether the mask
contains a 1 (0xff) or a zero.

The SSE2 code requires three instructions (and, andnot, or).

The equivalent Neon instruction is VBSL (bit select).

Reviewed-by: Samuel Rødal
(cherry picked from commit bdad106358ae177d1345f5ff85c0e38cfeb5ca90)

Change-Id: I5b0d055a4be532f81c6f11181d710525cd6c3f25
Reviewed-on: http://codereview.qt-project.org/4466
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAvoid double initialize of platform font database
Jiang Jiang [Thu, 1 Sep 2011 13:49:55 +0000 (15:49 +0200)]
Avoid double initialize of platform font database

Since platform font database will be populated in QFontDatabase::load,
no need to do it here in QFont::initialize.

Change-Id: I1b8c9f6fc9be40e0263ed3951c794141c6297e84
Reviewed-on: http://codereview.qt-project.org/4091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoAdd missing license header.
Jason McDonald [Wed, 7 Sep 2011 06:29:16 +0000 (16:29 +1000)]
Add missing license header.

Change-Id: Icbbb450d759b732ab28896365bb5126cf4723a62
Reviewed-on: http://codereview.qt-project.org/4308
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoadded QMAKE_MOC_OPTIONS variable to qmake
Keno Fischer [Wed, 7 Sep 2011 16:58:40 +0000 (18:58 +0200)]
added QMAKE_MOC_OPTIONS variable to qmake

Merge-request: 41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I8d492e9fbdbeeffa9f702a3a1f2fab314586809f
Reviewed-on: http://codereview.qt-project.org/4375
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoadded -b<file> option to moc to support additional include files
Keno Fischer [Wed, 7 Sep 2011 16:58:39 +0000 (18:58 +0200)]
added -b<file> option to moc to support additional include files

Merge-request: 41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I11a532b6ffe5f1c3e08aef8bc564e93f965b9e7c
Reviewed-on: http://codereview.qt-project.org/4374
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agotests: fix QNetworkProxyFactory test
Corentin Chary [Thu, 26 May 2011 07:32:39 +0000 (09:32 +0200)]
tests: fix QNetworkProxyFactory test

QNetworkProxy takes an hostname, not an url.

Change-Id: I7504fbc02a817d6c75ee55dc8bbdd66ec1e6cd01
Reviewed-on: http://codereview.qt-project.org/4373
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoChange in tst_qstylesheetstyle.cpp to work around a bug in testcocoon parser.
Caroline Chao [Wed, 7 Sep 2011 12:56:47 +0000 (14:56 +0200)]
Change in tst_qstylesheetstyle.cpp to work around a bug in testcocoon parser.

Change-Id: I1361e4c02e0c8a0424957c531e22a7b2236f725d
Reviewed-on: http://codereview.qt.nokia.com/4360
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix missing curly brackets in tst_global.cpp.
Caroline Chao [Wed, 7 Sep 2011 12:53:21 +0000 (14:53 +0200)]
Fix missing curly brackets in tst_global.cpp.

Those are required when exception handling is disabled.

Change-Id: I9ac862758bd961f4593a66d3e28005d766959478
Reviewed-on: http://codereview.qt.nokia.com/4359
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoQSslCertificate: block all DigiNotar (intermediate and root) certs
Peter Hartmann [Mon, 5 Sep 2011 10:53:49 +0000 (12:53 +0200)]
QSslCertificate: block all DigiNotar (intermediate and root) certs

and do not only check leaf certificates, but all intermediates and
the root. Tested manually with the cross-signed intermediates.

Change-Id: I860dc9b568bc244abc9228486dbb374a1a2b47c4
Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit 64adbd0c5775f97343afbe0e7b5fde0d70bdaedd)
Reviewed-on: http://codereview.qt.nokia.com/4291
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoPartially revert 25a0cf881e6ca6dc8bd969e7047c3967796fcd94
Aaron McCarthy [Wed, 7 Sep 2011 02:00:04 +0000 (12:00 +1000)]
Partially revert 25a0cf881e6ca6dc8bd969e7047c3967796fcd94

After the regexs in qtmodule-tests were fixed in the same commit it is
no longer necessary to explicitly add the include statement.  Any
existing content unrelated to config tests is preserved.

Change-Id: I90bab6b838191f050204992aa45262212b937059
Reviewed-on: http://codereview.qt.nokia.com/4296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoUpdate V8
Aaron Kennedy [Wed, 7 Sep 2011 00:51:39 +0000 (10:51 +1000)]
Update V8

This fixes a few bugs in QML mode name resolution and simplifies
our V8 patchset a little by folding some patches together.

Change-Id: Ia528a43ac8ccad95ac81bcdff5d05aaeab4b48b2
Reviewed-on: http://codereview.qt.nokia.com/4294
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoFixed compilation of QtV8 for mac
Rohan McGovern [Tue, 6 Sep 2011 23:57:05 +0000 (09:57 +1000)]
Fixed compilation of QtV8 for mac

configure is currently whitelisting a set of architectures which are
known to be capable of building V8.  macosx was omitted from this list.

Note that we don't attempt to differentiate between different macosx
architectures; we expect any mac which is capable of building Qt5 at all
is also capable of building V8.

Change-Id: I345f2a446d650cbeb1e2ad81656cdbeea6fa0d9a
Reviewed-on: http://codereview.qt.nokia.com/4293
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
13 years agoFix TextInput test failures.
Andrew den Exter [Mon, 5 Sep 2011 07:42:08 +0000 (17:42 +1000)]
Fix TextInput test failures.

emitCursorPositionChanged won't emit cursorPositionChanged if the
cursor position hasn't changed but that doesn't mean the micro focus
hasn't changed, so emit updateMicroFocus changed when
cursorPositionChanged isn't.

Task-number: QTBUG-21017 QTBUG-21011
Change-Id: Id0b6bd5aed16563b7b5cce643745e453ba4857a5
Reviewed-on: http://codereview.qt.nokia.com/4181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoconfigure should detect whether v8 can be built
Kent Hansen [Mon, 5 Sep 2011 10:47:17 +0000 (12:47 +0200)]
configure should detect whether v8 can be built

First of all, the -v8 option was missing from the set
of "Qt style yes options", so it wasn't even recognized.

Second, when the value is "auto" (the default), v8
should only be enabled if we are building for a supported
architecture. Currently that's i386, x86_64, and arm.
(When cross-compiling, CFG_ARCH will contain the target
architecture, which is what we want to check.)

Third, if -v8 is passed but the architecture isn't
supported, configure should issue an error.

Change-Id: I579597bc0d81c3097ee96a29493f5f8112be7edd
Reviewed-on: http://codereview.qt.nokia.com/4193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoDon't use QSettings to "cache" plugin information
Bradley T. Hughes [Wed, 31 Aug 2011 13:17:30 +0000 (15:17 +0200)]
Don't use QSettings to "cache" plugin information

The main rationale of the cache was to examine the plugin's build-key
before loading it. Now that the build-key has been removed, the cache
has lost its usefulness.

This is part of a larger push to not use QSettings for Qt specific
settings or caches.

See also:
http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000892.html
http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000960.html
http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000907.html
http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000904.html

Change-Id: I96e84aa25983c8e06e027ff70cef109444c362a2
Reviewed-on: http://codereview.qt.nokia.com/3978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoGeneric property support for platform windows
Lasse Holmstedt [Wed, 31 Aug 2011 07:55:11 +0000 (09:55 +0200)]
Generic property support for platform windows

QPlatformNativeInterface can now contain generic window
properties in a QVariantMap, to facilitate communication
with the compositor and clients for certain platforms.
When window properties change, a signal is emitted from the
respective QPlatformNativeInterface instance. The properties
are intended to be read/writable from both client and server.

Change-Id: I7b42f7910d03c0d309add6c7dbb1c9b66ad22a3f
Reviewed-on: http://codereview.qt.nokia.com/3956
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoNew configure.exe binary
Kent Hansen [Fri, 2 Sep 2011 05:41:42 +0000 (07:41 +0200)]
New configure.exe binary

Change-Id: I129b9f17cfc195656701acf7bf1472846d237935
Reviewed-on: http://codereview.qt.nokia.com/4113
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoPass log file name when constructing loggers.
Jason McDonald [Fri, 2 Sep 2011 07:08:20 +0000 (17:08 +1000)]
Pass log file name when constructing loggers.

Pass the filename when creating the logger rather than when commencing
output.  This will simplify forthcoming changes for running multiple
loggers.

Change-Id: I563aa97661caf279a5dcccb1321ff3ce4725b332
Reviewed-on: http://codereview.qt.nokia.com/4116
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoBeautify testlib's usage message
Jason McDonald [Thu, 1 Sep 2011 09:24:48 +0000 (19:24 +1000)]
Beautify testlib's usage message

Change-Id: Ibeed554075215a5c4a154339dfa751dfe14a4d33
Reviewed-on: http://codereview.qt.nokia.com/4059
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMake it easier to select words at the start of a line.
Andrew den Exter [Wed, 24 Aug 2011 01:26:29 +0000 (11:26 +1000)]
Make it easier to select words at the start of a line.

QTextControl's word selection will only include a word if the cursor
position is past the mid point of the word. This can make it
difficult to select words near the edges of the screen on touch
devices.  For the TextEdit word selection mode select a word ignore
the relative position within a word.

Task-number: QT-5206
Change-Id: I4e5675596cd89934b3c2bc5d825088887c222fe8
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/4166
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoFix delayed password masking mid-string.
Andrew den Exter [Wed, 17 Aug 2011 02:52:09 +0000 (12:52 +1000)]
Fix delayed password masking mid-string.

Unmask the last character typed, not the last character in the string.

Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c
Task-number: QTBUG-17003
Reviewed-by: Alan Alpert
(cherry picked from commit b98e9e69dd8ba33d5f01b9518d95b63b86c4b443)
Reviewed-on: http://codereview.qt.nokia.com/4165
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoMove cursorDelegate with the mouse selection of read only text input.
Andrew den Exter [Thu, 4 Aug 2011 00:58:26 +0000 (10:58 +1000)]
Move cursorDelegate with the mouse selection of read only text input.

Task-number: QTBUG-19109
Reviewed-by: Martin Jones
Change-Id: I709427fe73b2d6ed9e3526af140b9dc375740789
Reviewed-on: http://codereview.qt.nokia.com/4164
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoRestore Qt4.7 behaviour of QFileInfo::absolute(File)Path
Shane Kearns [Fri, 2 Sep 2011 17:40:45 +0000 (18:40 +0100)]
Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path

Many applications relied on the undefined behaviour that the
filesystem engines returned clean paths (despite the documentation
stating that they may not), and consequently suffered regressions with
Qt 4.8.

Unix paths are once again cleaned if necessary.
Windows/Symbian paths were already cleaned, but now use the utility
function to check if a path is dirty, to avoid duplicated code.

Task-number: QTBUG-19995
Change-Id: If8c18469f149291c9d079ae3da23bc2087bbd49a
Reviewed-on: http://codereview.qt.nokia.com/4154
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
13 years agoFix compile error on MSVC2008
Shane Kearns [Fri, 2 Sep 2011 17:39:16 +0000 (18:39 +0100)]
Fix compile error on MSVC2008

Change-Id: I4f6192b9db601076688b52bfd794ea80a7346729
Reviewed-on: http://codereview.qt.nokia.com/4153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
13 years agoQSslCertificate: also check common name for blacklisted certificates
Peter Hartmann [Tue, 30 Aug 2011 11:10:06 +0000 (13:10 +0200)]
QSslCertificate: also check common name for blacklisted certificates

... to reduce the possibility of blacklisting valid certificates that
happen to have the same serial number as a blacklisted one, which is
unlikely, but possible.

Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit 6b1a8129623e3716f2fc075608b260ce7c381fe2
and adapted to the source incompatible change)

Change-Id: If714c34f6ce028032eee6d68f34d088b6ad5a0cc
Reviewed-on: http://codereview.qt.nokia.com/3895
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoqssl: use reinterpret_cast instead of C-style casts
Corentin Chary [Wed, 31 Aug 2011 17:35:36 +0000 (19:35 +0200)]
qssl: use reinterpret_cast instead of C-style casts

Merge-request: 48
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Change-Id: Ia5ac3239e6f378f930cb299a5711aa98dbb2f418
Reviewed-on: http://codereview.qt.nokia.com/4012
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoUpdate our V8
Kent Hansen [Tue, 30 Aug 2011 11:36:52 +0000 (13:36 +0200)]
Update our V8

Change-Id: I8925815c068d697999955c45de9f0736ad31ed56
Reviewed-on: http://codereview.qt.nokia.com/3880
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoRemove the build-key from the plugin verification data
Bradley T. Hughes [Wed, 31 Aug 2011 12:23:42 +0000 (14:23 +0200)]
Remove the build-key from the plugin verification data

The build-key is an old mechanism to work around binary
incompatibilities in GCC 3.x versions. Modern GCC has not broken binary
compatibility since 3.4, making this mechanism obsolete.

The cache value stored now only includes Qt version, the debug/release
boolean, and the last modified time for the plugin. Old 4-value keys
will be replaced with new keys as the plugins are reloaded the first
time.

This also removes QLibraryInfo::buildKey(), which is a source-incompatible
change.

The UNIX and Windows configure tools have been updated to stop
outputting the QT_BUILD_KEY preprocessor directive.

See also:
http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000892.html

Change-Id: I7d06969a370d3d2c6de413c1230d9d6789cbf195
Reviewed-on: http://codereview.qt.nokia.com/3977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoFix comparison of absolute, unclean paths in QDir
Shane Kearns [Thu, 1 Sep 2011 14:04:33 +0000 (15:04 +0100)]
Fix comparison of absolute, unclean paths in QDir

QDir::operator== was creating a clean absolute path for comparison
purposes if the original path was relative.
However original absolute paths were trusted, even though they could
be unclean. Now they are checked for cleanliness first.

Task-Number: QTBUG-19995
Task-Number: QTBUG-20495
Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4
Reviewed-on: http://codereview.qt.nokia.com/4099
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
13 years agoqssl: add auto test to QSsl::Opaque QSslKeys
Corentin Chary [Wed, 31 Aug 2011 17:35:35 +0000 (19:35 +0200)]
qssl: add auto test to QSsl::Opaque QSslKeys

Also export two symbols for auto tests since opaque keys
need EVP_PKEY * created by openssl.

Change-Id: Ib7801ddfceb259de7291bfaa5940df87f68af97d
Merge-request: 48
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4011
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoRemove circular dependency in testlib logging
Jason McDonald [Thu, 1 Sep 2011 08:24:55 +0000 (18:24 +1000)]
Remove circular dependency in testlib logging

Remove one of the circular dependencies between QPlainTestLogger and
QTestLog by directly checking whether we're writing to stdout rather
than inferring the same by examining whether the output file name is
null.

Change-Id: I798288482c9e2e071e17a8622e8a8f8d5016dc7e
Reviewed-on: http://codereview.qt.nokia.com/4052
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agotest: removed bogus CONFIG+=debug in qdiriterator benchmark
Rohan McGovern [Wed, 31 Aug 2011 23:23:54 +0000 (09:23 +1000)]
test: removed bogus CONFIG+=debug in qdiriterator benchmark

This doesn't make sense, none of the other benchmarks do it, and it
breaks compilation for a release-only mac build.

Change-Id: I3bc73f670688d413afcae7fa88bab19f7b3dac33
Reviewed-on: http://codereview.qt.nokia.com/4017
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agotest: removed bogus CONFIG+=debug for badxml selftest
Rohan McGovern [Wed, 31 Aug 2011 22:55:06 +0000 (08:55 +1000)]
test: removed bogus CONFIG+=debug for badxml selftest

This appears to serve no purpose.
It was probably copy-pasted from assert.pro.

Change-Id: Ie3d9605b969ee11f2d64c1ac3e480e9efb862a3c
Reviewed-on: http://codereview.qt.nokia.com/4016
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agotest: fixed `assert' selftest for release-only mac builds
Rohan McGovern [Wed, 31 Aug 2011 22:43:18 +0000 (08:43 +1000)]
test: fixed `assert' selftest for release-only mac builds

This test intentionally crashes itself by using Q_ASSERT.

Since Q_ASSERT is a no-op in release builds, the .pro file was
attempting to always force debug mode for this project.

However, on platforms where debug vs release affect linkage (e.g. mac
and windows), this is invalid.  On these platforms, debug mode can't be
enabled unless debug versions of the Qt libraries are available, which
they are not if Qt is configured with `-no-debug-and-release -release'.

Use a different method to ensure that Q_ASSERT really asserts, for both
debug and release builds.

Change-Id: I13eea2c72c77a0a981850dbcaa77f65f147c8490
Reviewed-on: http://codereview.qt.nokia.com/4015
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoTry to ensure that QT_ARCH is always set when configuring v8
Kent Hansen [Thu, 1 Sep 2011 14:13:29 +0000 (16:13 +0200)]
Try to ensure that QT_ARCH is always set when configuring v8

This is a workaround for QTBUG-21224.

For v8 we want to use QT_ARCH as the primary variable for
detecting the target platform. Unfortunately, QT_ARCH isn't
set when v8.pro is parsed using fromfile() from within
another .pro file (namely src/src.pro).

qt_config seems to be the bare minimum that's needed to get
qconfig.pri (which sets QT_ARCH and friends) loaded.

Change-Id: Ideb713724b98dd100560eaf6d7be39df9a22a71e
Reviewed-on: http://codereview.qt.nokia.com/4094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoomit unassigned (and too recent) codepoints from the text Normalization process
Ritt Konstantin [Sat, 16 Jul 2011 00:45:28 +0000 (04:45 +0400)]
omit unassigned (and too recent) codepoints from the text Normalization process

http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability:
> handle any code points that were not defined in the earlier version
> as if they were unassigned: such code points will not decompose or compose,
> and their Canonical_Combining_Class value will be zero.

since QChar::Unicode_Unassigned value is 0, it's less than any other
QChar::UnicodeVersion value and must ba handled explicitly

Change-Id: I6df025b4173d407660adae77ec5eeb98d15cb8ce
Reviewed-on: http://codereview.qt.nokia.com/4084
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdd option to compare to different platform in lancelot autotest
aavit [Thu, 1 Sep 2011 12:50:59 +0000 (14:50 +0200)]
Add option to compare to different platform in lancelot autotest

(cherry picked from commit b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7)

Conflicts:

tests/baselineserver/src/baselineserver.cpp

Change-Id: Ie8bdff26b8394bb6a5b6b48225b20833dbee0637
Reviewed-on: http://codereview.qt.nokia.com/4082
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoCheck for V8 when auto-enabling Declarative module
Kent Hansen [Thu, 1 Sep 2011 12:23:53 +0000 (14:23 +0200)]
Check for V8 when auto-enabling Declarative module

Declarative no longer used QtScript, it uses V8.
This check in the configure script was stale.

Change-Id: I3c598c0343fc421fdd191a256e07eaa6f4e80058
Reviewed-on: http://codereview.qt.nokia.com/4077
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoDon't build v8 when -no-v8 is passed to configure
Kent Hansen [Thu, 1 Sep 2011 12:07:27 +0000 (14:07 +0200)]
Don't build v8 when -no-v8 is passed to configure

When v8 is enabled, QT_CONFIG contains "v8".
There is no "no-v8", meaning that v8 was built
regardless.

Change-Id: I66740b23e5f7cae80740576ea0f13c3ad2f9ad40
Reviewed-on: http://codereview.qt.nokia.com/4073
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoRename the private helper function QList::free() to QList::dealloc()
Bradley T. Hughes [Thu, 1 Sep 2011 09:58:22 +0000 (11:58 +0200)]
Rename the private helper function QList::free() to QList::dealloc()

As the comment suggests, renaming this function avoids confusion with
libc's free().

Change-Id: Ia077b92c947d81ef9d78de940a1cd8ed022edb3c
Reviewed-on: http://codereview.qt.nokia.com/4063
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoRemove declarations for QListData functions removed by 36c29ab
Bradley T. Hughes [Thu, 1 Sep 2011 09:53:19 +0000 (11:53 +0200)]
Remove declarations for QListData functions removed by 36c29ab

This commit removed the function implementations, but not the
declarations.

This removes QListData::append2(T) but moves the optimized
QListData::append2(T) implementation to QListData::append(T)

Change-Id: I39b6dea31420a7cefe079b94a91a96eb16000d2a
Reviewed-on: http://codereview.qt.nokia.com/4062
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoUpdate license headers
Gabriel de Dietrich [Thu, 1 Sep 2011 08:35:23 +0000 (10:35 +0200)]
Update license headers

This ammends commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f

Reviewed-by: Frederik Gladhorn
Merge-request: 1254
(cherry picked from commit eee351a2af7e34dfc851a95820075842f856a8f2)

Change-Id: Idd83457f87fea063843f8eaa47287531de7eb854
Reviewed-on: http://codereview.qt.nokia.com/4057
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
13 years agoFix various trivial formatting issues.
Jason McDonald [Thu, 1 Sep 2011 04:24:53 +0000 (14:24 +1000)]
Fix various trivial formatting issues.

Change-Id: Ifa2a2dd2aa26dab178ec1334376db42fc3ebb355
Reviewed-on: http://codereview.qt.nokia.com/4029
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove QXmlTestLogger constructor default param
Jason McDonald [Thu, 1 Sep 2011 01:13:14 +0000 (11:13 +1000)]
Remove QXmlTestLogger constructor default param

This class is never constructed with the parameter defaulted.

Change-Id: If9c3f6562da1e48635a9cf5332bee7e9641255fa
Reviewed-on: http://codereview.qt.nokia.com/4021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix inclusion of .qmake.cache for modules with config tests.
Aaron McCarthy [Tue, 30 Aug 2011 00:50:55 +0000 (10:50 +1000)]
Fix inclusion of .qmake.cache for modules with config tests.

Qt modules with config tests generate a module level .qmake.cache with
the results of the config tests.  The existance of this file prevents
qmake from walking up the directory tree and finding the Qt global
cache file.  This results in the system build not working as expected.
For example running 'make' in the module would only build the contents
of src and skip tests and examples.

Fixed by adding a include statement to the end of the config test
generated .qmake.cache.

Change-Id: I68a5f2a96f4ee02076b6457ae085f45d894cd4ed
Reviewed-on: http://codereview.qt.nokia.com/3830
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoSimplify qtestlib logging code, part 3
Jason McDonald [Wed, 31 Aug 2011 08:53:46 +0000 (18:53 +1000)]
Simplify qtestlib logging code, part 3

Collapse the QTestBasicStreamer class into QTestXunitStreamer.

Change-Id: I349b8db432fd45f9352084f60b36b460f3b61f6a
Reviewed-on: http://codereview.qt.nokia.com/3925
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoSimplify qtestlib logging code, part 2
Jason McDonald [Wed, 31 Aug 2011 07:08:28 +0000 (17:08 +1000)]
Simplify qtestlib logging code, part 2

Rename the QTestLogger class to QXunitTestLogger.

Change-Id: I7b93f9de4f4744e53997ccc001a745c36f375599
Reviewed-on: http://codereview.qt.nokia.com/3924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoSimplify qtestlib logging code, part 1
Jason McDonald [Tue, 30 Aug 2011 08:36:46 +0000 (18:36 +1000)]
Simplify qtestlib logging code, part 1

Both the old and new XML loggers produce the Complete and Light XML log
formats, while only the new logger produces Xunit XML logs.  The
disadvantage of the new logger is that it is more complex and doesn't
produce a partial log if the test fails to terminate gracefully.  This
behaviour arises because Xunit format output cannot be written correctly
until all tests have been executed.

This commit removes the Complete and Light XML formats from the new
logger, using the old logger to produce those formats and the new logger
to produce only Xunit XML.  Prior to this commit, the qtestlib selftests
demonstrate that the old and new loggers produce identical output for
Complete and Light XML.

This commit also removes the undocumented -flush command-line option,
which was used rather obscurely to select between the old and new
loggers.

The newer logger will be renamed to QXunitTestLogger in a subsequent
commit.

Change-Id: Id304f5b411bdd520409ee233f6bc34e8917942ab
Reviewed-on: http://codereview.qt.nokia.com/3923
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoqssl: add support for QSsl::Opaque key
Corentin Chary [Wed, 31 Aug 2011 17:35:35 +0000 (19:35 +0200)]
qssl: add support for QSsl::Opaque key

This allow to use directly EVP_PKEY * with QSslKey (for
example comming from a PKCS#11 dongle).

Change-Id: Icb1ba5081506a831ec3d8cfffe13ce70939608ea
Merge-request: 48
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4010
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoAdd src/v8/qtv8version.h to .gitignore
Bradley T. Hughes [Wed, 31 Aug 2011 13:19:07 +0000 (15:19 +0200)]
Add src/v8/qtv8version.h to .gitignore

Change-Id: I3e63a3b7cfc06ea4b71c55c1530433438c902aa7
Reviewed-on: http://codereview.qt.nokia.com/3979
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoFix build with Clang for libpng versions 1.4.0 to 1.5.2
Tor Arne Vestbø [Tue, 30 Aug 2011 14:25:54 +0000 (16:25 +0200)]
Fix build with Clang for libpng versions 1.4.0 to 1.5.2

Versions 1.4.0 to 1.5.2 of libpng declare png_longjmp_ptr to
have a noreturn attribute if PNG_PEDANTIC_WARNINGS_SUPPORTED
is enabled, but most declarations of longjmp in the wild do
not add this attribute. This causes problems when the png_jmpbuf
macro expands to calling png_set_longjmp_fn with a mismatched
longjmp, as compilers such as Clang will treat this as an error.

To work around this we override the png_jmpbuf macro to cast
longjmp to a png_longjmp_ptr.

See also http://llvm.org/bugs/show_bug.cgi?id=10338

Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Change-Id: I197cfa12af76410310e409bc0fce7d4332ee66a6
Reviewed-on: http://codereview.qt.nokia.com/3929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoIntroduce menubar plugin system
Aurélien Gâteau [Tue, 14 Jun 2011 16:04:26 +0000 (18:04 +0200)]
Introduce menubar plugin system

Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 31ff55bbeb84f10e75e997c75a63deda83e62507)

Change-Id: I0644514299c16cabe19d1e6d024dd652b2d7bc4e
Reviewed-on: http://codereview.qt.nokia.com/3933
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
13 years agoIntroduce QAbstractPlatformMenuBar
Aurélien Gâteau [Wed, 10 Nov 2010 22:37:56 +0000 (23:37 +0100)]
Introduce QAbstractPlatformMenuBar

Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f)

Change-Id: Ib0f035ac15ad0cc6be52807e8101f5dcfb5b041b
Reviewed-on: http://codereview.qt.nokia.com/3932
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
13 years agoHide Q<Platform>MenuAction
Aurelien Gateau [Thu, 7 Oct 2010 13:23:42 +0000 (15:23 +0200)]
Hide Q<Platform>MenuAction

This will help abstracting the platform specific parts of QMenuBarPrivate in a
common interface.

Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 68d633cc840c5526a0ad77985404f53ada6ba91a)

Change-Id: I733b8dfb71ae0dc78536cfe48b466394206d1de3
Reviewed-on: http://codereview.qt.nokia.com/3931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
13 years agoFix warning about initialization order
Aurélien Gâteau [Wed, 10 Nov 2010 21:58:18 +0000 (22:58 +0100)]
Fix warning about initialization order

Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit b4ddcbbf1ce067a823815c07a357a065be731d48)

Change-Id: I809de3c201f47cd8936845447ad60b00cf4c0db7
Reviewed-on: http://codereview.qt.nokia.com/3930
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
13 years agoRemove XFAIL from selftests for some platforms
Jason McDonald [Wed, 31 Aug 2011 04:14:06 +0000 (14:14 +1000)]
Remove XFAIL from selftests for some platforms

The selftest for assert messages calls QEXPECT_FAIL if the assert
message doesn't exactly match the expected output.  This is because
Q_ASSERT uses __FILE__, which is compiler-dependant.

The expected output for this test contains various hard-coded unix
paths meaning that the test never passes on any platform.  This commit
removes those paths from the test data so that the test passes for
compilers that don't put path information in __FILE__.  This commit also
makes the XFAIL message more accurate -- absolute paths in assert
messages don't come from QTestLib, they come from Q_ASSERT's use of
__FILE__.

Change-Id: I9aae212379b43a29ae83715717cc978b4b619420
Reviewed-on: http://codereview.qt.nokia.com/3908
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAdd QLocale::toUpper/Lower
Lars Knoll [Fri, 19 Aug 2011 10:17:06 +0000 (12:17 +0200)]
Add QLocale::toUpper/Lower

The toUpper/Lower() methods in QString should not
be locale dependent, as this can lead to rather
hard to find bugs in at least a turkish locale.

Rather have explicit, locale dependend case conversions
available in QLocale.

Reviewed-by: Denis Dzyubenko
(cherry picked from commit da0e1e101bb4c44c25b6523357fa81ad1b2d6539)

Change-Id: I1cc3f341bef17ad573a736dc94c9c5d514ace54e
Reviewed-on: http://codereview.qt.nokia.com/3259
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoCorrectly position aliased lines with flat caps
Lars Knoll [Fri, 19 Aug 2011 09:58:18 +0000 (11:58 +0200)]
Correctly position aliased lines with flat caps

The code was mispositioning lines by half a pixel, as it
added half a pixel offset and then rounded in addition.
This submit fixes this and also removes certain artifacts when
drawing rects at .5 pixel positions.

Lance now doesn't show any significant differences to the
4.7 rendering anymore.

Task-number: QTBUG-20199
Reviewed-by: Aavit
(cherry picked from commit 49409f612c47f30434aa809e4d2c963f1a6bb88a)

Change-Id: Iab3936e688eba16b82f5cdb4f36f54af807d78ea
Reviewed-on: http://codereview.qt.nokia.com/3260
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoQSslCertificate: regenerate blacklisted certificates, they were expired
Peter Hartmann [Tue, 30 Aug 2011 10:24:30 +0000 (12:24 +0200)]
QSslCertificate: regenerate blacklisted certificates, they were expired

regenerating blacklisted certificates with same serial number and
common name, but longer validity: Now they are valid for 10 years.
(cherry picked from commit a3d22777028b102b7f65cf2db9719f5d57308b04)

Change-Id: I7884484c2f61b3a55f671faa38967e62fc8954f0
Reviewed-on: http://codereview.qt.nokia.com/3894
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
13 years agoFix errors in lightxml test logger
Jason McDonald [Wed, 31 Aug 2011 02:52:27 +0000 (12:52 +1000)]
Fix errors in lightxml test logger

The newer test logger did not produce the same light XML output as the
logger that it replaced.  In particular, it did not output the <DataTag>
tag and it incorrectly nested a <Message> tag inside the <Incident> tag
when a fatal error occured in a test.

Unfortunately, it appears that the expected lightxml output for the
selftests was produced by running tests using the newer logger, while
the selftests did not use the older lightxml logger.  Thus the errors
were not detected by the selftests.

This commit adds the older lightxml logger to the selftests, updates the
expected test data accordingly, and modifies the newer lightxml logger
to behave correctly.  This last item is achieved by making the lightxml
streamer copy most of the code from the xml streamer -- lightxml output
is supposed to be same as xml, except for the omission of the root and
<TestCase> tags.

Change-Id: Ie6e1f69dd6000df2b9d0c5c8e2109fe7bbff3956
Reviewed-on: http://codereview.qt.nokia.com/3902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMake lightxml and xml log formatting consistent
Jason McDonald [Tue, 30 Aug 2011 09:54:32 +0000 (19:54 +1000)]
Make lightxml and xml log formatting consistent

For XML logs, an Incident tag with no sub-tags has a space before the
closing slash.  For Light XML logs, this space was missing unless the
-flush command line option was supplied.

Change-Id: I6de2e140f9309f333b5b97ed7f8116e4e727a149
Reviewed-on: http://codereview.qt.nokia.com/3871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove ability to run tests in random order.
Jason McDonald [Mon, 29 Aug 2011 06:50:52 +0000 (16:50 +1000)]
Remove ability to run tests in random order.

Remove the undocumented feature that allows test functions to be
executed in random order.  The feature was designed to expose unintended
dependencies between test functions -- test functions are only supposed
to depend on the initTestCase() and init() functions.

Aside from the lack of documentation, there are a number of problems
with this feature.  Most importantly, running the tests in random order
has only a 50% chance of exposing dependencies between test functions.
A better strategy would be to run the test functions in reverse order
and complain if that produces different results to running the tests in
the normal order.

Additionally, the random order is not deterministic, so even if a
dependency is exposed during a test run, there's no guarantee that it
will be exposed again.  The feature allows the user to optionally
supply a random seed to make the "random" order deterministic, but as
rand() implementations are not identical across platforms, even that
does not guarantee that dependencies between test functions will be
exposed deterministically.

Change-Id: I39eac34c532ccb988116778bbc5ab05d835874c5
Reviewed-on: http://codereview.qt.nokia.com/3720
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMake sure tests/auto/v8.pro doesn't clobber auto.pro
Kent Hansen [Tue, 30 Aug 2011 10:37:08 +0000 (12:37 +0200)]
Make sure tests/auto/v8.pro doesn't clobber auto.pro

The omission of spaces is crucial in order for the
regular expressions in configure to be able to detect
that v8.pro isn't a "main project" file.

Task-number: QTBUG-21168
Change-Id: I2e94736ee3195bed7fd528759b1bc1812f1ae54c
Reviewed-on: http://codereview.qt.nokia.com/3878
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoQSslCertificate: blacklist fraudulent *.google.com
Peter Hartmann [Tue, 30 Aug 2011 09:33:01 +0000 (11:33 +0200)]
QSslCertificate: blacklist fraudulent *.google.com

blacklist the leaf certificate for now. There might well be more fake
certificates in the wild, for that either the Diginotar.nl root cert
needs to be disabled on the system or OCSP would need to be enabled
(not supported by Qt yet).

Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit 70f6a1b91b242174682c30be976c2aa36c450cc7)

Change-Id: I7cd3fdc4c6e85202914764f983a60d301e54aa35
Reviewed-on: http://codereview.qt.nokia.com/3893
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoCompile fix on Mac OS X
Bradley T. Hughes [Tue, 30 Aug 2011 12:19:52 +0000 (14:19 +0200)]
Compile fix on Mac OS X

The file is called shapeitem.cpp (lowercase i), not shapeItem.cpp (with
uppercase I)

Change-Id: I0dd230158cf8c8323bfa779901475535e7c7d694
Reviewed-on: http://codereview.qt.nokia.com/3883
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoQHttpNetworkConnection : Fix the case when we only have one channel
Martin Petersson [Wed, 24 Aug 2011 15:24:21 +0000 (17:24 +0200)]
QHttpNetworkConnection : Fix the case when we only have one channel

For the Happy eyeballs implementation we use two channels for the case
where a host lookup gives us both Ipv4 and Ipv6 addresses.
In the case where the Connection is setup to only use one channel
we can not use this solution, so in this case we should use the old
way of connecting with one channel.

Task-number: QTBUG-20981
Change-Id: I6590fb4c67d6a8261cd0e4da8f99cd3603bbb524
Reviewed-on: http://codereview.qt.nokia.com/3524
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoQHttpNetworkReply: Change dataReadProgress to qint64.
Martin Petersson [Mon, 22 Aug 2011 11:44:35 +0000 (13:44 +0200)]
QHttpNetworkReply: Change dataReadProgress to qint64.

Task-number: QTBUG-20890
Change-Id: I36d942d26247c99eb70c035da48dc0afa6afc591
Reviewed-on: http://codereview.qt.nokia.com/3316
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoAdd a signal emitted callback to QAbstractDeclarativeData
Aaron Kennedy [Fri, 19 Aug 2011 12:05:50 +0000 (22:05 +1000)]
Add a signal emitted callback to QAbstractDeclarativeData

For property notify signals, QtDeclarative can manage connections
in a more special case - and more performant - way.  This patch
adds a callback hook so that QtDeclarative can intercept signals
being emitted by declarative objects.

Change-Id: I72554e80df0a4257da65d81cc1c5db88a11446a4
Reviewed-on: http://codereview.qt.nokia.com/3363
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFix fontconfig configure test
Jiang Jiang [Mon, 29 Aug 2011 14:23:24 +0000 (16:23 +0200)]
Fix fontconfig configure test

It does not necessarily require X11.

Change-Id: Ie10f91b2052af21ea877d6c7d322fc43e84108cb
Reviewed-on: http://codereview.qt.nokia.com/3815
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoAdd QtV8 library to QtBase
Kent Hansen [Tue, 16 Aug 2011 08:50:00 +0000 (10:50 +0200)]
Add QtV8 library to QtBase

This adds Aaron's copy of V8 to src/3rdparty/v8 (as a
git submodule), and builds it as a "normal" Qt library
(without any dependencies on Qt itself).

The library can be added to a project with

QT += v8-private

V8 API headers are available as private includes, e.g.

 #include <private/v8.h>

The API is private because we're exposing a third-party
API directly, and we don't want to (and cannot) make
source or binary compatibility guarantees for it.

Since we want the V8 public API headers to be private
headers in Qt, syncqt and sync.profile were extended to
understand a new configuration option, the
@allmoduleheadersprivate array, that tells syncqt whether
all the library headers should be treated as private even
though they don't follow the _p.h Qt convention.

The V8 project files, patches and autotests are copied
from the QtDeclarative repository. The next step after
this commit is to remove QtDeclarative's copy of V8 and
link with QtV8 instead.

Task-number: QTBUG-20963
Change-Id: Ib8820362cdbc8fa662a5e97db841656cf38d1b62
Reviewed-on: http://codereview.qt.nokia.com/3092
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoOptimized QMatrix4x4 by improving how 'flagBits' are used.
Kim Motoyoshi Kalland [Fri, 19 Aug 2011 13:00:41 +0000 (15:00 +0200)]
Optimized QMatrix4x4 by improving how 'flagBits' are used.

Change-Id: Ic417336489d334e25b547c719d457faf65307cac
Reviewed-on: http://codereview.qt.nokia.com/3670
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoRemove the QTEST_NOEXITCODE define.
Jason McDonald [Mon, 29 Aug 2011 01:47:57 +0000 (11:47 +1000)]
Remove the QTEST_NOEXITCODE define.

Tests that are expected to return a non-zero exitcode should be marked
with "CONFIG+=insignificant_test" in their .pro file.

Change-Id: Iebb9c7129c08833ed517115f569086d6fcfe827b
Reviewed-on: http://codereview.qt.nokia.com/3689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRename COMPARE_IMPL2 to TO_STRING_IMPL.
Jason McDonald [Fri, 26 Aug 2011 08:42:34 +0000 (18:42 +1000)]
Rename COMPARE_IMPL2 to TO_STRING_IMPL.

Change-Id: Idbc8c78815f9259c5ecc36fbb053d64f6802c66b
Reviewed-on: http://codereview.qt.nokia.com/3649
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove unused function
Jason McDonald [Fri, 26 Aug 2011 08:36:59 +0000 (18:36 +1000)]
Remove unused function

Change-Id: I04eea17a3674beb59c84e3992f9bb2754f7b3525
Reviewed-on: http://codereview.qt.nokia.com/3646
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove literal tabs
Jason McDonald [Fri, 26 Aug 2011 08:32:16 +0000 (18:32 +1000)]
Remove literal tabs

Change-Id: I06064f68a0ca23968cec30ccb063dadf2e67571b
Reviewed-on: http://codereview.qt.nokia.com/3645
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove default params from QTestData constructor
Jason McDonald [Fri, 26 Aug 2011 08:10:08 +0000 (18:10 +1000)]
Remove default params from QTestData constructor

The constructor asserts if either parameter is null, so having defaults
seems to be pointless.

Change-Id: I8cec52e17e5f94458e8d8323855eaed6433686e7
Reviewed-on: http://codereview.qt.nokia.com/3644
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete ifdef.
Jason McDonald [Fri, 26 Aug 2011 08:01:43 +0000 (18:01 +1000)]
Remove obsolete ifdef.

QTEST_EMBED is not defined in Qt itself, nor is it defined by any of the
CI builds for Qt's supported platforms.

Change-Id: I73a3979630130fc8f1ef99dcbc17b4d1875ba246
Reviewed-on: http://codereview.qt.nokia.com/3641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove debugging printf.
Jason McDonald [Fri, 26 Aug 2011 07:49:56 +0000 (17:49 +1000)]
Remove debugging printf.

Change-Id: Ib5733e96d3a6cec956d2f4c326d7be42e813c440
Reviewed-on: http://codereview.qt.nokia.com/3639
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete autotest command-line flag.
Jason McDonald [Fri, 26 Aug 2011 07:43:55 +0000 (17:43 +1000)]
Remove obsolete autotest command-line flag.

The charting functionality was removed in Qt 4.6, though the
command-line option was retained to print a warning that the feature had
been removed.  Sufficient time has passed for this to be removed
completely.

Change-Id: I2adf2818c6a6e57e765104de97b28dbf6914e3fa
Reviewed-on: http://codereview.qt.nokia.com/3638
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoSend error messages to stderr rather than stdout
Jason McDonald [Fri, 26 Aug 2011 07:36:55 +0000 (17:36 +1000)]
Send error messages to stderr rather than stdout

The commit changes printf's that output error and warning messages to
send their text to the stderr stream.  Non-error output, such as that
produced by passing the -help option to a test, still goes to stdout.

Change-Id: Iea4d62451e3e7e84c654859cb09ea7e717511d13
Reviewed-on: http://codereview.qt.nokia.com/3636
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove unused members and methods from QTestLogger.
Jason McDonald [Wed, 24 Aug 2011 04:25:20 +0000 (14:25 +1000)]
Remove unused members and methods from QTestLogger.

QTestLogger was counting various test outputs, but was only using three
of the counters internally and the rest were not used at all.  This
commit removes the unused counters and all of the getter methods.

Change-Id: I447183dcaf3e6cc335bbf58656e25b1d32ba810a
Reviewed-on: http://codereview.qt.nokia.com/3437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove unused methods from QTestLogger.
Jason McDonald [Wed, 24 Aug 2011 03:48:56 +0000 (13:48 +1000)]
Remove unused methods from QTestLogger.

The setLogFormat() and logFormat() methods are never called -- the log
format is set in the call to the constructor and it would not make sense
to change it during a test run.

Change-Id: I59256f17f28bbc72d86cabfb2a961d2faf0e2d52
Reviewed-on: http://codereview.qt.nokia.com/3435
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove QTestLog constructor/destructor definitions
Jason McDonald [Wed, 24 Aug 2011 07:58:31 +0000 (17:58 +1000)]
Remove QTestLog constructor/destructor definitions

QTestLog is an entirely static class and its constructor and destructor
are declared private to prevent accidental construction of an instance
of the class.  Therefore, the constructor and destructor do not need to
be defined.

Change-Id: I860f1344c5032091f5c641a20e1656bb52a6f07e
Reviewed-on: http://codereview.qt.nokia.com/3466
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAdd missing assertions.
Jason McDonald [Wed, 24 Aug 2011 08:20:44 +0000 (18:20 +1000)]
Add missing assertions.

For both QTestLog::addFail() and QTestLog::addIgnoreMessage(), passing
a null message does not make sense and is therefore an error that
should be brought to the developer's attention.

Change-Id: Ib09ad90b70d74f7432c08708db8a70dee008cce4
Reviewed-on: http://codereview.qt.nokia.com/3470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>