profile/ivi/qtbase.git
12 years agoRemove redundant copies of QTRY_COMPARE.
Jason McDonald [Mon, 7 Nov 2011 04:47:59 +0000 (14:47 +1000)]
Remove redundant copies of QTRY_COMPARE.

QTRY_COMPARE is now part of qtestlib, so there's no need for copies of
it.

Change-Id: Ied4e7d3b30c1cf16ddcbf8655e4d976e74c2bd8a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUpdate .gitignore
David Faure [Mon, 7 Nov 2011 10:25:41 +0000 (11:25 +0100)]
Update .gitignore

Change-Id: Ie304ec2776d6fdef734da8bbc22e8dea77417c78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoWidgets: Remove remains of Windows file dialog.
Friedemann Kleint [Tue, 8 Nov 2011 15:40:30 +0000 (16:40 +0100)]
Widgets: Remove remains of Windows file dialog.

Also remove Windows-specific binary compatility hack from Qt4.

Change-Id: I4b6914b357f21737e392745f907c770db9f7a641
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQGlobal: Define a default message handler
Aurindam Jana [Tue, 8 Nov 2011 09:45:18 +0000 (10:45 +0100)]
QGlobal: Define a default message handler

Currently, qInstallMsgHandler() does not return the
handle to the default message handler. This patch defines
a default message handler. This is returned by
qInstallMsgHandler() when called for the first time. A call
to qInstallMsgHandler(0) will restore the default message
handler as was the case previously.

Change-Id: I42f06654d45fb0e633f3c6d912fc8f05c23249aa
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQNAM: Fix authentication cache when the password is in the URL
Olivier Goffart [Tue, 8 Nov 2011 14:37:42 +0000 (15:37 +0100)]
QNAM: Fix authentication cache when the password is in the URL

Two problems:
 - The signal cacheCredidentials was not connected in the synchronous
   case while it must be connected. (Regression when the threaded http
   was merged)
 - We cannot cache the credidentials when we proceed the url because
   at that point, we do not know the realm (this basically reverts
   9bc5a32b875b812c3a706034c8c27614f86bd138)

Task-number: QTBUG-18411

Change-Id: I8ea11fa23db4314c3f17ed06d2d7f9ee934ccdba
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoAvoid double initialize of platform font database
Jiang Jiang [Tue, 8 Nov 2011 14:17:18 +0000 (15:17 +0100)]
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.

The change was in cd781b732ed29b41b5ac18e39cbbba2815fc8f8b but lost
in previous merge.

Change-Id: Iaa56fea5765d94e4f7b58409654bc218808086cd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoSSL: blacklist intermediate certificates that issued weak certs
Peter Hartmann [Fri, 4 Nov 2011 15:56:12 +0000 (16:56 +0100)]
SSL: blacklist intermediate certificates that issued weak certs

... as did browser vendors.
Tested manually with affected CA certificates.

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

Change-Id: I5bf6c147abf6d2de0f313d65faa2d9a1e9684cea
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoCocoa cursor support: Add QCocoaCursor.
Morten Sorvig [Thu, 3 Nov 2011 11:58:53 +0000 (12:58 +0100)]
Cocoa cursor support: Add QCocoaCursor.

Port the Qt 4 mac implementation.

Change-Id: I3bc6fd0b5a0398dcf43a5aaa3b498bb74b42c105
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoWidgets: Use QPlatformDialogHelper in QColorDialog/QFontDialog.
Friedemann Kleint [Fri, 4 Nov 2011 13:45:42 +0000 (14:45 +0100)]
Widgets: Use QPlatformDialogHelper in QColorDialog/QFontDialog.

Change-Id: Ib9a2f19679c2d4c8583742a918d61c1a98403843
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdd Q_DECLARE_PRIVATE equivalent for QDir, to be able to subclass it
David Faure [Sat, 5 Nov 2011 11:09:54 +0000 (12:09 +0100)]
Add Q_DECLARE_PRIVATE equivalent for QDir, to be able to subclass it

Apply the same solution to QFileInfo (no public detach(), but a
non-inline d_func instead).

Change-Id: I31c4c759f44a0649b97f7884b078b174c9c00f22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoThe value of the -sysroot option of configure was not getting set correctly
Kevin Simons [Mon, 7 Nov 2011 15:37:36 +0000 (16:37 +0100)]
The value of the -sysroot option of configure was not getting set correctly

Change-Id: I35f7b87e1fa176358b85bca646fbf1a388cb77a5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoCompleted change to eliminate v8.pro
Jo Asplin [Mon, 7 Nov 2011 13:11:03 +0000 (14:11 +0100)]
Completed change to eliminate v8.pro

The initial change to eliminate v8.pro was
incomplete - see 803b7d651cc5593ef4512d707c9d05c64478b7d6.

Change-Id: Ia2c996d247f8b19380363f3e0409d38d3b839fdb
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoMoved utf8/ and deleted corelib.pro
Jo Asplin [Mon, 7 Nov 2011 12:45:12 +0000 (13:45 +0100)]
Moved utf8/ and deleted corelib.pro

This change moves utf8/ into corelib, thus
allowing corelib.pro to be deleted.

Change-Id: Ib1b4e0930ac0e116d9bbc242a6dfb63ae5785d19
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRe-enabled tst_qdialog
Jo Asplin [Mon, 7 Nov 2011 11:19:52 +0000 (12:19 +0100)]
Re-enabled tst_qdialog

Commit 0fd8514a57ec8c6bd824e3c30a559988c53b95c8 ensured that
the showAsTool test function is now properly QSKIP'ed for
platforms where it is always known to fail.

This change re-enables the test case as a whole so that
the passing test function may actually catch real Qt bugs again
(without being ignored by CI).

Task-number: QTBUG-22453
Change-Id: Icfe56558f8c0f4b50dbbc21d9748df6d81fea4fe
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoDeleted QWS tests
Jo Asplin [Thu, 3 Nov 2011 12:33:32 +0000 (13:33 +0100)]
Deleted QWS tests

QWS is not supported for Qt 5, so the QWS tests are deleted.

Change-Id: I08837fbd879915bbca9f821fad3551450eb3a1c6
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoQPainterPath: Fix copy constructor again.
Charles Yin [Tue, 8 Nov 2011 04:42:08 +0000 (14:42 +1000)]
QPainterPath: Fix copy constructor again.

The previous fix a05270f435483937e76d18fa6e512dc0394507d1 is not correct,
QPainterPathPrivate(other) should be QPainterPathPrivate(), as there
is only a default ctor for QPainterPathPrivate and ref is initialized there,
 use copy ctor just copies the ref value which makes all detach() calls broken.

Add an unit test for this as well.

Change-Id: I658f0a977664d5ec523af3f8a48c1a866eda6ab0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix subpixel positioning support
Jiang Jiang [Fri, 4 Nov 2011 13:47:31 +0000 (14:47 +0100)]
Fix subpixel positioning support

Move subpixelPositionForX from QTextureGlyphCache to QFontEngine,
since some font engines like QFontEngineFT may need a custom
implementation or tweak it a little bit.

In QRasterPaintEngine::drawCachedGlyphs, do not add aliasedCoodinate
to x offset as that will break subpixel positioning.

Change-Id: Idbcec617509459b80965220ceb07b17737649bbf
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoImplement QRegion::isNull
Jędrzej Nowacki [Tue, 25 Oct 2011 12:52:21 +0000 (14:52 +0200)]
Implement QRegion::isNull

The method was missing from QVariant perspective (QVariant::isNull
supposed to call isNull not isEmpty).

Change-Id: Ic1ac9f662e275ac73908809f2c4ac59679b40b00
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
12 years agoAdded '-' parameter to fix strings command using gcc-llvm on Mac OS 10.6 w/ Xcode...
Chris Meyer [Mon, 7 Nov 2011 21:15:14 +0000 (13:15 -0800)]
Added '-' parameter to fix strings command using gcc-llvm on Mac OS 10.6 w/ Xcode 4.2.

Change-Id: Ib44c17c92fd67e8ffe3f34fa9c6014d8f0d861a8
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
12 years agoQPainterPath: Fix copy constructor.
Friedemann Kleint [Mon, 7 Nov 2011 14:38:35 +0000 (15:38 +0100)]
QPainterPath: Fix copy constructor.

Re-add base class initialization accidentally removed by
e277575987657aa07444eea9bee99769f039d3b0.
Fix warning: 'base class 'class QPainterPathPrivate' should be
explicitly initialized in the copy constructor.

Change-Id: Ie94fa82eeeb3a8ddc69aef447f73ce36da616916
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoBump QCoreApplicationPrivate::app_compile_version to 0x050000
Bradley T. Hughes [Wed, 2 Nov 2011 14:23:50 +0000 (15:23 +0100)]
Bump QCoreApplicationPrivate::app_compile_version to 0x050000

The minimum compile version is 0x050000 now, it cannot be less. Remove
checks for 0x040200 in the widget code, which provided compatibility in
the 4.x series for binaries compiled with 4.0 and 4.1.

Change-Id: Ia01da90de26dca6aeeb79d29c754cbeeecf809af
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoCleanup corelib autotests
Jason McDonald [Mon, 7 Nov 2011 05:33:49 +0000 (15:33 +1000)]
Cleanup corelib autotests

Remove redundant empty constructors, destructors and test functions.

Change-Id: Idb51368895e67ec3fc0345a9a5d33d77730c051b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMoved qobjectperformance into other/
Jo Asplin [Fri, 4 Nov 2011 15:43:53 +0000 (16:43 +0100)]
Moved qobjectperformance into other/

The qobjectperformance test is a kind
of performance test that asserts that the
time it takes to emit a signal to a certain
number of receivers does not exceed a certain
time.

other/ currently seems to be a sensible place for
such a test. Alternatively, it could have been put
next to corelib/kernel/qobject/.

Change-Id: I5c9461b62984f5806d1f6940123d30ef9f9f5a37
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRefer to v8 directly as a subdirectory.
Jo Asplin [Thu, 3 Nov 2011 13:03:18 +0000 (14:03 +0100)]
Refer to v8 directly as a subdirectory.

v8 may be specified directly as a subdirectory in
tests/auto/auto.pro instead of indirecly referring to v8.pro.

Change-Id: I95d8c788fa67958372795519036cd8aec835b324
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoqtbase/examples: Add options to standarddialogs example.
Friedemann Kleint [Fri, 4 Nov 2011 08:05:50 +0000 (09:05 +0100)]
qtbase/examples: Add options to standarddialogs example.

Categorize dialogs using a toolbox and add an
options groupbox for dialogs that have options flags.

Besides example usage, this allows people implementing
platform native dialogs to play around with the options.

Change-Id: Icc0fd00382332b11783271ef15a0583c18758784
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agosymbian epoc root code removed
Joerg Bornemann [Fri, 4 Nov 2011 13:59:38 +0000 (14:59 +0100)]
symbian epoc root code removed

Change-Id: Ibc9f5e42c534a09a8a44a0c95789f467970d38a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoqmake: remove symbian support
Joerg Bornemann [Fri, 4 Nov 2011 12:51:20 +0000 (13:51 +0100)]
qmake: remove symbian support

Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRe-enabled passing tests in tst_qmenu
Jo Asplin [Fri, 4 Nov 2011 13:41:04 +0000 (14:41 +0100)]
Re-enabled passing tests in tst_qmenu

To increase the effective test coverage, this patch
re-enables the tst_qmenu test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: I62cc1a2a9b0206595808deafb5fc137888ec97b3
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoremove symbian support from configure
Joerg Bornemann [Mon, 7 Nov 2011 09:16:21 +0000 (10:16 +0100)]
remove symbian support from configure

Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRe-enabled passing tests in tst_qinputcontext
Jo Asplin [Fri, 4 Nov 2011 13:20:31 +0000 (14:20 +0100)]
Re-enabled passing tests in tst_qinputcontext

To increase the effective test coverage, this patch
re-enables the tst_qinputcontext test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Ib1d4946ab29e67e0e72f4f9c6a7bf39b65d0f6be
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRe-enabled passing tests in tst_qprinter
Jo Asplin [Fri, 4 Nov 2011 12:55:08 +0000 (13:55 +0100)]
Re-enabled passing tests in tst_qprinter

To increase the effective test coverage, this patch
re-enables the tst_qprinter test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: I74cc30dc26b8b83852b3516f8def995eab19cf0f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFix QQuickTextInput implicit width.
Andrew den Exter [Fri, 4 Nov 2011 08:07:04 +0000 (18:07 +1000)]
Fix QQuickTextInput implicit width.

QQuickTextInput tries to set the UseDesignMetrics text option on its
QLineControl but this is overridden by the options set in
updateDisplayText(). Apply the new options in updateDisplayText to
the existing options.

Change-Id: I6789c3c2d6e496c1594d586bd075473983978f77
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSSL certificate extensions: add unit tests
Richard Moore [Wed, 2 Nov 2011 14:25:03 +0000 (14:25 +0000)]
SSL certificate extensions: add unit tests

Added tests for each of the supported extensions, and also for the
handling of unknown ones.

Change-Id: I29e0a5c1a411f41c2a554293662a33b56f205c00
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSSL certificates: add functionality to read extensions
Richard Moore [Wed, 2 Nov 2011 14:07:43 +0000 (15:07 +0100)]
SSL certificates: add functionality to read extensions

... by adding a new class QSslCertificateExtension and methods in
QSslCertificate to support extensions. This is needed e.g. for OCSP
(checking revocation status of a certificate) or Extended Validation
certificates.

Change-Id: I5c5d9513fa640cd487786bb9a5af734afebd0828
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoReinstate and deprecate the two argument QMetaType::construct
Kevin Simons [Fri, 4 Nov 2011 11:43:49 +0000 (12:43 +0100)]
Reinstate and deprecate the two argument QMetaType::construct

Change-Id: Id291f00ba13a39b4af022b75fd428b876d6dd9b0
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoQLineEdit - made mouse interactions commit preedit
Pekka Vuorela [Tue, 4 Oct 2011 14:44:35 +0000 (17:44 +0300)]
QLineEdit - made mouse interactions commit preedit

Simplifying input context mouse handling rules by making
the editor in charge when text gets committed and selected.

This includes:
 - Allowing selection to start on top of preedit. Commits once a
   single character gets selected
 - Double click to commit preedit before selecting a word.
 - Only sending events to input context that happen on top of preedit.
 - Committing preedit when a mouse press happens outside of it,
   allowing to move cursor to click position.

Change-Id: I9dab00ea3445055ffd0d7cae540a1197c5748509
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix broken indendation with hard tabs
Pekka Vuorela [Tue, 1 Nov 2011 15:17:04 +0000 (17:17 +0200)]
Fix broken indendation with hard tabs

Change-Id: I1aa161ddab55f11683b2eee3c205505a829013c4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
13 years agoSupport tentative commit string with input method.
Pekka Vuorela [Wed, 12 Oct 2011 08:08:00 +0000 (11:08 +0300)]
Support tentative commit string with input method.

Tentative commit string allows input method to notify editor
what is expected to be committed in the place of preedit.
This commit adds such support in QLineEdit.

Change-Id: If855619bc6843652db0d6254f7e7063bb8ad0936
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoQTextEdit - mouse events to override input context
Pekka Vuorela [Fri, 7 Oct 2011 10:48:29 +0000 (13:48 +0300)]
QTextEdit - mouse events to override input context

- Selection can start on top of preedit
- Mouse press outside preedit commits
- Double click to commit on top of preedit

Change-Id: Ia2698d97d354a677d935de1a8fd9ed53a161ca5e
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoMoved qmetaobjectbuilder test into corelib/kernel/
Jo Asplin [Thu, 3 Nov 2011 09:57:23 +0000 (10:57 +0100)]
Moved qmetaobjectbuilder test into corelib/kernel/

This commit moves the qmetaobjectbuilder test from test/auto/
into corelib/kernel/ since that matches the location in the Qt source.

Change-Id: I0342e8185ce775b0ef71849f365bf54c8fb56da4
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoRemove unused PlatformQuirks functions.
Jason McDonald [Fri, 4 Nov 2011 05:33:24 +0000 (15:33 +1000)]
Remove unused PlatformQuirks functions.

These functions are no longer used anywhere in qtbase and are highly
unlikely to be used elsewhere.

Change-Id: I8e7c433c3b3e799ce0e5bc465182a5046275eb00
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMoved qobjectrace into integrationtests/
Jo Asplin [Thu, 3 Nov 2011 13:11:36 +0000 (14:11 +0100)]
Moved qobjectrace into integrationtests/

The qobjectrace test seems to belong to
integrationtests/ since it tests the interaction
between QObject and QThread (much in the same way
integrationtests/qsharedpointer_and_qwidget/ tests the
interaction between QSharedPointer and QWidget).

Change-Id: I89f1dab7300c2ef23755d52a86479677ef021ef1
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoAllow disabling FreeType internal cache
Jiang Jiang [Fri, 4 Nov 2011 15:08:57 +0000 (16:08 +0100)]
Allow disabling FreeType internal cache

To disable it, set QT_NO_FT_CACHE environment variable to 1.

Change-Id: I086aa93c71cbdf86858a41a2bbad5d2db247cdfb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoFix a warning in QGlyphRun compilation
Jiang Jiang [Fri, 4 Nov 2011 13:47:57 +0000 (14:47 +0100)]
Fix a warning in QGlyphRun compilation

Change-Id: Ic072240193fc8eb5e7fdcd0dada79383398b224b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoRestore subpixel rendering support with fontconfig and FreeType
Jiang Jiang [Fri, 4 Nov 2011 15:09:45 +0000 (16:09 +0100)]
Restore subpixel rendering support with fontconfig and FreeType

Change-Id: I45cf83374ba5a8b1ae88415950c1e5ab72991598
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoMoved tests into gui/kernel/ and gui/qopengl/
Jo Asplin [Thu, 3 Nov 2011 09:12:44 +0000 (10:12 +0100)]
Moved tests into gui/kernel/ and gui/qopengl/

This commit moves tests from test/auto/ into more appropriate
locations (i.e. matching the locations in the Qt source):

- qscreen and qwindow are moved into gui/kernel/
- qopengl is moved into gui/qopengl/

Note: qscreen is disabled for now since it is broken
on Linux (see QTBUG-22554).

Change-Id: Idcc7a51e78d6d0955bddb9cb4091866659193cc8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoPrevent timestamps in widgets' touch events from disappearing
Laszlo Agocs [Fri, 4 Nov 2011 12:22:30 +0000 (14:22 +0200)]
Prevent timestamps in widgets' touch events from disappearing

Change-Id: I096914eb2b02ad9c4a5c0462a1f4b76ef17c3957
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAdded ref to bug report in qglthreads.pro
Jo Asplin [Fri, 4 Nov 2011 10:44:45 +0000 (11:44 +0100)]
Added ref to bug report in qglthreads.pro

Change-Id: Iecbda846eada49634b473959c642b8ee4c46c5c1
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoAdded -datatags option to QTestLib
Jo Asplin [Tue, 1 Nov 2011 11:19:39 +0000 (12:19 +0100)]
Added -datatags option to QTestLib

(Note: This feature is ported from Qt 4.8.
 See the following commits:
  01575deafb7d26ca2431374e92c6d71de96547c7
  4866d1ba8afbab61e102942d1ea93b81fea053d6
)

Passing the -datatags option to a QTestLib program prints the
available data tags to standard output.

For completeness, the test case name is also printed
at the start of each output line. (Although the file name
is supposed to match the lower-case version of the test case
name, this is currently not true in all cases (particularly not
under tests/benchmarks/). Even if there was a script to enforce this
convention, the -datatags option provides this information in a
reliable way.)

Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:

Case 1: No tags:
    tst_MyTestCasetst_MyTestCase f

Case 2: Local tags only:
    tst_MyTestCase f local tag 1
    tst_MyTestCase f local tag 2
    ...

Case 3: Global tags only:
    tst_MyTestCase f __global__ global tag 1
    tst_MyTestCase f __global__ global tag 2
    ...

Case 4: Local and global tags:
    tst_MyTestCase f local tag 1 __global__ global tag 1
    tst_MyTestCase f local tag 2 __global__ global tag 1
    ...
    tst_MyTestCase f local tag 1 __global__ global tag 2
    tst_MyTestCase f local tag 2 __global__ global tag 2
    ...
    ...

Note that the string __global__ is assumed to be highly unlikely to occur
in a data tag (if it does, an ambiguity results).

Change-Id: Ib51aa0c3c32ad52e52ce519729292cf8f0ec5d50
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoqmake: vcproj ignores subdirs that do "no_default_target".
Friedemann Kleint [Tue, 1 Nov 2011 09:40:31 +0000 (10:40 +0100)]
qmake: vcproj ignores subdirs that do "no_default_target".

It's nicer to do:
    SUBDIRS += foo
    foo.CONFIG = no_default_target no_default_install
then to omit foo from SUBDIRS because a Makefile is still produced
but "make" and "make install" don't descend automatically.

The vcproj generator doesn't know about this. This patch gets it to
check for no_default_target and then it simply ignores the directory.

Change-Id: I127bea79143c101612afb0e9c6603d3b065c7c56
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoadd integrity gbuild to the project file for convenience
Oswald Buddenhagen [Thu, 29 Sep 2011 19:19:51 +0000 (21:19 +0200)]
add integrity gbuild to the project file for convenience

Change-Id: I126eec019695bef7dd418d122ad911d9a10e0aa4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoFix usage of QtConcurrent headers with -Wshadow -Werror
David Faure [Thu, 3 Nov 2011 22:22:43 +0000 (23:22 +0100)]
Fix usage of QtConcurrent headers with -Wshadow -Werror

Change-Id: I172888518a3db01f89e61061eccf85f7f3387d07
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoWindows: Add dialog helpers for native dialogs.
Friedemann Kleint [Fri, 4 Nov 2011 13:36:28 +0000 (14:36 +0100)]
Windows: Add dialog helpers for native dialogs.

Implement QPlatformDialogHelper for file dialogs based on
IFileDialog. Add prototypical implementation of color dialogs.

Change-Id: If3c7470be6c0b8fbf8cfea1b6638bda43afafea7
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
13 years agoRevert "Avoid fontconfig access in fontEngine creation"
Jiang Jiang [Thu, 3 Nov 2011 14:15:16 +0000 (15:15 +0100)]
Revert "Avoid fontconfig access in fontEngine creation"

This reverts commit 8dcb52df8e2e949232ccded9fad5a4f25ba6dda2.

Turns out that hint style is retrieved from font match instead of
pattern match, which shouldn't be retreived until font engine
creation.

Change-Id: I90e779a3823e6a6604cdadb52586fcd5e22c295b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoRe-enabled passing tests in tst_qvariant
Jo Asplin [Thu, 3 Nov 2011 12:16:50 +0000 (13:16 +0100)]
Re-enabled passing tests in tst_qvariant

To increase the effective test coverage, this patch
re-enables the tst_qvariant test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Ibf0dc3caf50d34084fa50cf76d199e77a42f6e16
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoImprove QtGui start-up time and memory use.
Samuel Rødal [Wed, 2 Nov 2011 16:02:11 +0000 (17:02 +0100)]
Improve QtGui start-up time and memory use.

The gamma lookup tables can be allocated and computed on demand, as
they're not always needed, depending on the platform and the use case.

Change-Id: I2d4c2860746366a0e46edb53bd4ecd2778de2464
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agotest: Use QWidget::grab() instead of QPixmap::grabWidget()
Sergio Ahumada [Fri, 4 Nov 2011 09:53:45 +0000 (10:53 +0100)]
test: Use QWidget::grab() instead of QPixmap::grabWidget()

Removing warnings from the test function as QPixmap::grabWidget()
is being deprecated.

Change-Id: I26ad1e9def0bebe8e4ee997068ba593245d0cd05
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoRevert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
Joerg Bornemann [Fri, 28 Oct 2011 09:32:26 +0000 (11:32 +0200)]
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"

This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d.

Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems
for several people. Also, this leads to problems when using the binary
installer for development.

Change-Id: I4097c8d0962c633bab6edbb86df9046d93148cab
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoRevert "Use standard spelling for two languages"
Lars Knoll [Fri, 4 Nov 2011 09:57:36 +0000 (10:57 +0100)]
Revert "Use standard spelling for two languages"

This reverts commit 9358f7eaa4b773bdbfa45b08ab92a89096954881.

The change is source incompatible and hasn't been agreed upon. Revert
it even though it's correct in principle. It's simple to keep the old
enums around for compatibility.

Change-Id: I8d9d33868e44d0299a3f081833b06cedf0ed4345
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoQStandardPaths: add DownloadLocation.
David Faure [Thu, 3 Nov 2011 18:13:32 +0000 (19:13 +0100)]
QStandardPaths: add DownloadLocation.

Only properly implemented on unix (XDG), falls back to Document location
on Mac and Windows, because not easily available with the current API
being used by either one.

Change-Id: Id269f0e3c4e3a68e19205de96c0b39980fde80ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoFix tst_qstandardpaths: Mac OSX is a unix, but doesn't use XDG.
David Faure [Thu, 3 Nov 2011 18:12:53 +0000 (19:12 +0100)]
Fix tst_qstandardpaths: Mac OSX is a unix, but doesn't use XDG.

Change-Id: I2b4552a162dc9f993e0587ace6e7e3fb4f96571e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRe-enabled passing test in tst_qdbuspendingcall
Sergio Ahumada [Thu, 3 Nov 2011 21:00:56 +0000 (22:00 +0100)]
Re-enabled passing test in tst_qdbuspendingcall

tst_QDBusPendingCall::watcher_waitForFinished_threaded()
autotest was fixed by faa6113c41b81368c5bbc2a764c2ae9bbc42e415

Task-number: QTBUG-20859
Change-Id: I05aaebfde45862836b10700aa7d9c64e4287466f
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoDon't rely on PlatformQuirks in qimagereader test
Jason McDonald [Fri, 4 Nov 2011 05:16:35 +0000 (15:16 +1000)]
Don't rely on PlatformQuirks in qimagereader test

The PlatformQuirks header is, by its author's own admission, based on
"very bad assumptions", those being that only Meego has quirks.

The assumption that only Meego has versions of libjpeg and libpng with
rounding errors is not a good assumption.  Change the test to be a
little tolerant of rounding error regardless of the platform, at least
until there's a reliable way to tell which libjpeg/libpng versions have
rounding errors.

Change-Id: Id2be5cc54739249b615bf3307ee1850c0a5c06b3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDo not put cursor at non-stop character positions
Jiang Jiang [Tue, 13 Sep 2011 15:35:08 +0000 (17:35 +0200)]
Do not put cursor at non-stop character positions

When moving cursors, non-stop positions are skipped, however certain
input sequences can still lead us there. In such cases we should
simply ignore those positions in cursorToX.

Task-number: QTBUG-7076
Change-Id: Ia0a25931f4043359f72a6c0c14a74b905e40b93e
Reviewed-by: Eskil
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoRelease font engine refcount when done using it in QTextEngine
Jiang Jiang [Fri, 9 Sep 2011 12:31:39 +0000 (14:31 +0200)]
Release font engine refcount when done using it in QTextEngine

5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for
font engines in QTextEngine cache, we need to decrease them when
the QTextEngine is deallocated.

Task-number: QTBUG-21222
Reviewed-by: Eskil
(cherry picked from commit 8935a84e18804c7ff4b7336e3cfdf1cd558eaf1c)

Change-Id: I079c903d60e1bbcf78f555f8044dde69af82cf0e
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoUse standard spelling for two languages
Jiang Jiang [Thu, 1 Sep 2011 13:51:42 +0000 (15:51 +0200)]
Use standard spelling for two languages

Singhalese -> Sinhalese
Divehi -> Dhivehi

Change-Id: I3faa7163202a4a9be14e3cf857da60aa4dd3196f
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoQWidgets: Delayed creation of the QPlatformDialogHelper.
Friedemann Kleint [Wed, 2 Nov 2011 14:35:18 +0000 (15:35 +0100)]
QWidgets: Delayed creation of the QPlatformDialogHelper.

- Create helper only once and ensure deletion
- Move nativeDialogInUse into QDialogPrivate, ensuring the native
  modal helper is called from QDialog::exec() only if it is true

Change-Id: Id92b278bb051ce254458f276fbf7075689a7d491
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoRe-enabled passing tests in tst_qlistview
Jo Asplin [Tue, 1 Nov 2011 13:18:31 +0000 (14:18 +0100)]
Re-enabled passing tests in tst_qlistview

To increase the effective test coverage, this patch
re-enables the tst_qlistview test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: I029be60c16cdff5ee3e38889d2780f1ee7d01b51
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoAdd QT_MODULE(Gui) macro
Sergio Ahumada [Mon, 31 Oct 2011 20:37:57 +0000 (21:37 +0100)]
Add QT_MODULE(Gui) macro

Fixing `macros' function test of `tst_headers'

Task-number: QTQAINFRA-324
Change-Id: Ib6fcf276108bbb5515a72f3f17b373de82a599fc
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoQtGui: Fix compilation with gcc 4.4
Friedemann Kleint [Tue, 1 Nov 2011 13:36:20 +0000 (14:36 +0100)]
QtGui: Fix compilation with gcc 4.4

- Do not mix QStringLiteral and Q_TR_NOOP.
- Replace static QString member variables by
- static member functions to return the strings.
- Use tr() since QAccessibleActionInterface declares it.

Acked-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agotest: Skipping tst_qmdisubwindow::setFont() as it's unstable
Sergio Ahumada [Thu, 3 Nov 2011 17:56:10 +0000 (18:56 +0100)]
test: Skipping tst_qmdisubwindow::setFont() as it's unstable

This unstable test is preventing some good changes from being
merged. Further investigation needs to follow, so people can
refer to QTBUG-22544 for a real fix.

Change-Id: I038e5f340ccd2562d0e67428af595a2bcfc8c11d
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoFixed returned geometry of toplevel child widgets
Oliver Wolff [Thu, 3 Nov 2011 12:08:51 +0000 (13:08 +0100)]
Fixed returned geometry of toplevel child widgets

If a widget has got a parent widget but also is a toplevel widget it
should not return its geometry relative to its parent.
In addition to that, child widgets which are not toplevel should not
change their left and top values according to their parent but also
keep their width and height intact.

Change-Id: I5e641abf5ddc0b8d056ba023f8de52af1d2ccc9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix unstable test due to a race in QThread
Bradley T. Hughes [Thu, 3 Nov 2011 10:10:44 +0000 (11:10 +0100)]
Fix unstable test due to a race in QThread

QThread::finished() is emitted before setting the thread's state to
finished and !running, which means it's possible to receive the
finished() signal and act on it while QThread::isRunning() still
returns true.

This test randomly fails due to this race. Fix it by using checking
the return value of QThread::wait() instead.

Change-Id: Ibf347fc9a2e8d32b328227ee6978e1129dd781f4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoQThread::isFinished should return true from finished()
Olivier Goffart [Thu, 3 Nov 2011 13:11:34 +0000 (14:11 +0100)]
QThread::isFinished should return true from finished()

and isRunning() should return false.

This restore the Qt 4.7 behaviour

In Qt 4.7, the finished() was called with the thread's intenal mutex
locked. Which mean that:
 - Call to isRunning or isFinished called from a slot connected to
   finish within the thread would deadlock. (Hence no compatibility
   to keep here)
 - Call to isRunning or isFinished from a slot connected with
   QueuedConnection in another thread would lock the mutex until
   the destructors are finished. and then return as if the thread have
   finished.

Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoEnable deprecated feature for now
Olivier Goffart [Wed, 26 Oct 2011 18:25:35 +0000 (20:25 +0200)]
Enable deprecated feature for now

Rationale is that it makes it possible to deprecate functions without
breaking other modules.

After the feature freeze, this should be reset to 5

Notice that QT_DEPRECATED is not defined while bootstrapping Qt
(QT_NO_DEPRECATED defined)

This also means that compilation is tested

Change-Id: I85f0e65ac3a160e9aba3833787ded3f94304cb90
Reviewed-by: David Faure <faure@kde.org>
13 years agoRenamed QTextLayout member variable for readability
Pekka Vuorela [Wed, 2 Nov 2011 11:30:38 +0000 (13:30 +0200)]
Renamed QTextLayout member variable for readability

Class complex enough already without int i as member variable.
Furthermore, some methods use loop variable with same name, shadowing
the member one.

Change-Id: Idf2f5e34f130a60eb6121480e596e443f23641dd
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoDocumented side-effect of QTextLayout::setPreeditArea()
Pekka Vuorela [Wed, 2 Nov 2011 08:53:09 +0000 (10:53 +0200)]
Documented side-effect of QTextLayout::setPreeditArea()

Invalidates layout and requires layouting again.

Change-Id: I1cb954f155e4fc1df4b217478998ac903cc18323
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoFix regular expression when replacing headers
Harald Fernengel [Wed, 2 Nov 2011 23:42:32 +0000 (00:42 +0100)]
Fix regular expression when replacing headers

Use non-greedy capturing where it makes sense, also
keep the user's whitespace indentation in his include statements

Change-Id: Iff2b5dabf443529292e943ae69427bd15e702bf9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRemove empty functions from QDirModel test.
Jason McDonald [Thu, 3 Nov 2011 05:07:09 +0000 (15:07 +1000)]
Remove empty functions from QDirModel test.

Change-Id: Ieb8af41425739f9175df26224b171cd9f8b3c4f3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove QDirModel autotest
Jason McDonald [Tue, 1 Nov 2011 01:34:09 +0000 (11:34 +1000)]
Improve QDirModel autotest

The unreadable() test function has been disabled since before the tests
were imported into the Qt repository.  The idea of the test seems valid
(though the original implementation failed to correctly create an
unreadable file), so it should be re-enabled.

Change-Id: I94634bc5785dfbfbb42ca975badaead7fe812b29
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix getting of enviroment strings in testlib
Jason McDonald [Wed, 2 Nov 2011 08:39:20 +0000 (18:39 +1000)]
Fix getting of enviroment strings in testlib

The standard C getenv() returns NULL if the requested environment
variable is not found.

In Qt4 and later, qgetenv() does not return a null pointer if the
requested environment string is not defined.  Instead it returns a
QByteArray containing an empty string.  If using qgetenv(), there is no
way to tell the difference between an undefined environment variable
and one which is defined to be the empty string.

In testlib, all calls to qgetenv() were checking whether the returned
QByteArray's constData() returned a null pointer, but that would never
happen.  These calls must instead check whether the QByteArray contains
a non-empty string.

Change-Id: I342f0e8b196896c26cccce3ff169fa1b9669b5ff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAllow extra selftests without modifying source.
Jason McDonald [Fri, 28 Oct 2011 08:19:05 +0000 (18:19 +1000)]
Allow extra selftests without modifying source.

Change-Id: I21708b725611eb64bdb0414cee08ca00dd62b213
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoGet rid of "#if 0" and skipped tests in QPainter autotest.
Samuel Rødal [Tue, 1 Nov 2011 07:12:07 +0000 (08:12 +0100)]
Get rid of "#if 0" and skipped tests in QPainter autotest.

qt_format_text_clip() and qt_format_text_boundingrect() have been
skipped ever since they were originally added to git, so I see no point
in keeping them.

The #if 0 in setEqualClipRegionAndPath() was ifdefed out from when that
specific test case was added (maybe it was failing to begin with?), but
it passes now, so we should enable it.

Change-Id: I6551e3b5612a4d4b00a969511af6abc85db43892
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoQStandardPaths: fix encoding of XDG_CONFIG_HOME env var
David Faure [Wed, 2 Nov 2011 17:15:37 +0000 (18:15 +0100)]
QStandardPaths: fix encoding of XDG_CONFIG_HOME env var

Change-Id: Ibb89f204fc93aed5a669f8f9efc7859845e6d493
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRe-enabled passing tests in tst_qgraphicsitem
Jo Asplin [Mon, 31 Oct 2011 08:33:35 +0000 (09:33 +0100)]
Re-enabled passing tests in tst_qgraphicsitem

To increase the effective test coverage, this patch
re-enables the tst_qgraphicsitem test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: If311bc61801d2a279c274928ae7f0faeb595eeb3
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoRe-enabled passing tests in tst_qgraphicsview
Jo Asplin [Mon, 31 Oct 2011 09:25:35 +0000 (10:25 +0100)]
Re-enabled passing tests in tst_qgraphicsview

To increase the effective test coverage, this patch
re-enables the tst_qgraphicsview test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: I6b8eb09000ece789b990a2dd697cdb8b47cc8e1c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoRe-enabled passing tests in tst_qgraphicsscene
Jo Asplin [Mon, 31 Oct 2011 09:45:11 +0000 (10:45 +0100)]
Re-enabled passing tests in tst_qgraphicsscene

To increase the effective test coverage, this patch
re-enables the tst_qgraphicsscene test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Idd229532787ce8138d8e1c86daf1f91b90e87e38
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoMoved tests into network/ssl/
Jo Asplin [Tue, 1 Nov 2011 13:04:01 +0000 (14:04 +0100)]
Moved tests into network/ssl/

This commit moves qsslsocket_onDemandCertificates_member and
qsslsocket_onDemandCertificates_static from tests/auto/ to
tests/auto/network/ssl/.

Change-Id: I1593e113016ce7bb7dffbee82f1196275784d0ac
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoAdding custom bezier easing curves to QEasingCurve
Thomas Hartmann [Wed, 2 Nov 2011 11:33:30 +0000 (12:33 +0100)]
Adding custom bezier easing curves to QEasingCurve

I added the possibilty to define Bezier/TCB splines and use them
as custom easing curves.

Note:
Splines have a parametric definition. This means we have a
function/polynom of t that evalutes to x and y. x/y = f(t).

For our purpose we actually need the function y = f(x).
So as a first step we have to solve the solution x = f(t) for a given
t and then in a second step we evaluate y = f(t).

f(t) is a cubic polynom so we use cardanos formula to solve this equation
directly.

For the casus irreducibilis we need 3 functions that are a combination of
arcos and cos. Instead of evaluating arcos and cos we approximate these
functions directly.

TCB splines are converted into the corresponding cubic bezier spline.

Change-Id: Id2afc15efac92e494d6358dc2e11f94e8c524da1
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoWindows platform plugin: Fix compiler warnings.
Friedemann Kleint [Wed, 2 Nov 2011 09:58:06 +0000 (10:58 +0100)]
Windows platform plugin: Fix compiler warnings.

Change-Id: Id7111ca74455b93aabb803babff51c4393508dbc
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
13 years agoUse C++11 static_assert
Olivier Goffart [Wed, 2 Nov 2011 09:26:50 +0000 (10:26 +0100)]
Use C++11 static_assert

Change-Id: I75aa2bc209cdc8869e7daa9fd0dd865ccf65a68e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoSilence warning from clang: semicolon before method body is ignored
Bradley T. Hughes [Mon, 31 Oct 2011 15:02:37 +0000 (16:02 +0100)]
Silence warning from clang: semicolon before method body is ignored

qnsview.mm:171:45: warning: semicolon before method body is ignored
      [-Wsemicolon-before-method-body]
- (void)handleMouseEvent:(NSEvent *)theEvent;
                                            ^

Change-Id: I0b2fdd9c28586ce03f14f784d35e88dbbb5bd8f4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoDisable warnings while building QtV8
Bradley T. Hughes [Tue, 1 Nov 2011 12:45:01 +0000 (13:45 +0100)]
Disable warnings while building QtV8

This is a 3rd-party submodule that we do not directly modify. Warnings
from this code is of no value to people diagnosing and fixing warnings
in Qt code itself.

Change-Id: If17d9ce6509abb7d7aa1f00daf7e771fc6231993
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoTestlib: Remove remains of qpa.
Friedemann Kleint [Tue, 1 Nov 2011 07:42:14 +0000 (08:42 +0100)]
Testlib: Remove remains of qpa.

Link ApplicationServices in the non-qpa case (CoreServices
present).

Change-Id: I7555243aa480a7a4db84731a797924a97bf200cd
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoReinstate disabled part of qsortfilterproxymodel test
Jason McDonald [Tue, 1 Nov 2011 06:45:36 +0000 (16:45 +1000)]
Reinstate disabled part of qsortfilterproxymodel test

This test function has been disabled since before the tests were
imported into the Qt repository in 2006, but seems to pass today, at
least on Linux.

Change-Id: I8ff90a11a0fbb260d66b20ae735b5f21c450a5af
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove stale test data from qsortfilterproxymodel test
Jason McDonald [Tue, 1 Nov 2011 05:59:40 +0000 (15:59 +1000)]
Remove stale test data from qsortfilterproxymodel test

The removed test data has been disabled since before the tests were
added to the Qt repository in June 2006, and was incomplete (the
"pattern" field was missing).

Change-Id: I974d03a4dcca76ba1a20f740372702612c8ce02b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled code from QWidget autotest.
Jason McDonald [Tue, 1 Nov 2011 05:52:34 +0000 (15:52 +1000)]
Remove disabled code from QWidget autotest.

The removed code was already disabled when first committed in January
2009.

Change-Id: I00a82f2e673fee76869cc76d756c36d081da2d2a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled code from qgridlayout autotest
Jason McDonald [Tue, 1 Nov 2011 05:33:12 +0000 (15:33 +1000)]
Remove disabled code from qgridlayout autotest

The removed code was already disabled when it was first added in June
2006, and is based on assumptions that no longer hold true.

Change-Id: Id7941d46e2a993aac422554dcc5540eb64eac492
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled test data from QUrl autotest
Jason McDonald [Tue, 1 Nov 2011 04:40:32 +0000 (14:40 +1000)]
Remove disabled test data from QUrl autotest

The removed test data was for obex URLs, which are not supported by
QUrl.

Change-Id: I166130ae936342d415165e46b7943d198de8986b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove redundant #if 1 from qdbusmarshall test
Jason McDonald [Tue, 1 Nov 2011 03:57:04 +0000 (13:57 +1000)]
Remove redundant #if 1 from qdbusmarshall test

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