profile/ivi/qtbase.git
12 years agoMac: make platformsupport a static lib
Morten Sorvig [Wed, 24 Aug 2011 07:47:20 +0000 (09:47 +0200)]
Mac: make platformsupport a static lib

The "force framework/no-framework" logic does not
really work, since Qt is now a mix of frameworks
and statics libs. Remove this code path and use
the "detection" path instead.

Also remove the exports from platformsupport.

Change-Id: I0a308666480445eb47c4f443ff7529addecad10d
Reviewed-on: http://codereview.qt.nokia.com/3464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoMoving relevant tests to corelib/thread
Holger Ihrig [Fri, 26 Aug 2011 10:56:14 +0000 (12:56 +0200)]
Moving relevant tests to corelib/thread

Task-number: QTBUG-21066

Change-Id: Ia16fa8961f1a73f4da6709197b5dd9929c16583f
Reviewed-on: http://codereview.qt.nokia.com/3663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoMoving relevant tests to corelib/statemachine
Holger Ihrig [Fri, 26 Aug 2011 10:03:32 +0000 (12:03 +0200)]
Moving relevant tests to corelib/statemachine

Task-number: QTBUG-21066

Change-Id: I6dfff1c3b3ad2119a588dc52eb5a2e67255284c1
Reviewed-on: http://codereview.qt.nokia.com/3658
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoMoving relevant tests to corelib/plugin
Holger Ihrig [Thu, 25 Aug 2011 13:53:06 +0000 (15:53 +0200)]
Moving relevant tests to corelib/plugin

Task-number: QTBUG-21066

Change-Id: I918f6ef6fb825d7cf94d6b42322b2c2eb5c52aaa
Reviewed-on: http://codereview.qt.nokia.com/3604
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoMoving relevant tests to corelib/kernel
Holger Ihrig [Thu, 25 Aug 2011 10:16:22 +0000 (12:16 +0200)]
Moving relevant tests to corelib/kernel

Added Test for qmetaproperty

Marked QSocketNotifier Autotest as insignificant. See QTBUG-21204

Marked qtranslator Autotest as insignificant. See QTBUG-21125

Marked corelib/io/qfile/largefile as insignificant. See QTBUG-21175

Task-number: QTBUG-21066
Change-Id: I2a7f6587845c355091bb07c8dd3d1557d16db0be
Reviewed-on: http://codereview.qt.nokia.com/3598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoMoved gui autotests into new directory structure
Jo Asplin [Wed, 31 Aug 2011 15:11:06 +0000 (17:11 +0200)]
Moved gui autotests into new directory structure

Task-number: QTBUG-21133

Change-Id: I83b8f652935cf92151265ca2530a3cf81c31fdef
Reviewed-on: http://codereview.qt.nokia.com/3996
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
12 years agoCompile fix.
Samuel Rødal [Thu, 1 Sep 2011 08:48:23 +0000 (10:48 +0200)]
Compile fix.

uilib includes QtGui and QtWidgets headers, so should explicitly add gui
and widgets in the .pri file.

Change-Id: I5f1e80d1379cb5389287df73d6070fd8ff712a3b
Reviewed-on: http://codereview.qt.nokia.com/4055
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMoved dbus autotests into new directory structure
Jo Asplin [Wed, 31 Aug 2011 10:42:57 +0000 (12:42 +0200)]
Moved dbus autotests into new directory structure

Task-number: QTBUG-21108

Change-Id: I8cdd4af59db3716921e7392379584f349ed29136
Reviewed-on: http://codereview.qt.nokia.com/3602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake xcb plugin compile again.
Laszlo Agocs [Thu, 1 Sep 2011 06:25:22 +0000 (09:25 +0300)]
Make xcb plugin compile again.

The name of function handleExposeEvent has not changed.

Change-Id: Ida4621bbf988088c0a75f1c93a3332702f0d92b7
Reviewed-on: http://codereview.qt.nokia.com/4037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoClean up shared resources immediately as the last context is destroyed.
Samuel Rødal [Mon, 29 Aug 2011 10:45:39 +0000 (12:45 +0200)]
Clean up shared resources immediately as the last context is destroyed.

By not waiting until deleteLater() kicks in it's easier to auto-test. We
can now add a test case for what happens when a shared resource is still
valid while the last context is destroyed.

Change-Id: I72963928e6a921e49ed59a79e2579b497ba37ccf
Reviewed-on: http://codereview.qt.nokia.com/3732
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoThe XCB plugin should not rely on QT_CONFIG=opengl anymore
Gunnar Sletta [Wed, 31 Aug 2011 12:07:54 +0000 (14:07 +0200)]
The XCB plugin should not rely on QT_CONFIG=opengl anymore

Change-Id: Ieeedb7eb68704df811c613873bd2fc4b77e2aa04
Reviewed-on: http://codereview.qt.nokia.com/3966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoCocoa: Fix qmlscene flicker on startup.
Morten Sorvig [Tue, 23 Aug 2011 10:51:11 +0000 (12:51 +0200)]
Cocoa: Fix qmlscene flicker on startup.

The SG render thread was racing window creation in
the GUI thread, which would cause flicker if the
window won the race and was shown before the SG
thread had a frame ready.

Send a synchronous expose event before showing the
window - this will wait for the SG render thread.

In addition, don't defer NSwindow creation. The GL
context setup is done before the window is shown
and needs a fully created window.

New API: QWindowSystemInterface::handleSynchronousExposeEvent
Retire: QWindowSystemInterface::handleExposeEvent

Change-Id: I0bb46089d16ec4882aaac8db67b57d15e0f51531
Reviewed-on: http://codereview.qt.nokia.com/3399
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoIntroduce Q_QTQUICK1_EXPORT fixing exports in declarative.
Friedemann Kleint [Wed, 31 Aug 2011 14:04:51 +0000 (16:04 +0200)]
Introduce Q_QTQUICK1_EXPORT fixing exports in declarative.

Change-Id: Id70c6792b5342074ef78944e7e28bd9c9b83c107
Reviewed-on: http://codereview.qt.nokia.com/3983
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoInitialize member variable
Lars Knoll [Wed, 31 Aug 2011 13:44:14 +0000 (15:44 +0200)]
Initialize member variable

Change-Id: I165c267b87dc201ed4970d50e39ff7421cbef35f
Reviewed-on: http://codereview.qt.nokia.com/3981
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix further test builds on Windows.
Friedemann Kleint [Wed, 31 Aug 2011 13:21:48 +0000 (15:21 +0200)]
Fix further test builds on Windows.

Change-Id: I9846d19c5975f4d17bed46c59272a0fa428fd0d1
Reviewed-on: http://codereview.qt.nokia.com/3980
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCompile with host architecture armv5tel
Eskil Abrahamsen Blomfeldt [Wed, 31 Aug 2011 11:59:04 +0000 (13:59 +0200)]
Compile with host architecture armv5tel

Change-Id: Ied7ef4052e192d1585d7eed7a100b01f79f9773d
Reviewed-on: http://codereview.qt.nokia.com/3962
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix compile on Windows.
Friedemann Kleint [Wed, 31 Aug 2011 11:33:58 +0000 (13:33 +0200)]
Fix compile on Windows.

Change-Id: I72b1c35c3f92e1198a8c888f9d732b202d84047c
Reviewed-on: http://codereview.qt.nokia.com/3953
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix autotests to build on Windows.
Friedemann Kleint [Wed, 31 Aug 2011 11:24:37 +0000 (13:24 +0200)]
Fix autotests to build on Windows.

Basically breakage by <windows.h> being included from the OpenGL
parts of <QtGui/QtGui> included from <QtTest/QtTest>.

Change-Id: Id285fb89c64bf77e2408faac5688acd085579351
Reviewed-on: http://codereview.qt.nokia.com/3952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdd a QStyleHints class to QtGui
Lars Knoll [Wed, 31 Aug 2011 08:47:09 +0000 (10:47 +0200)]
Add a QStyleHints class to QtGui

This class encapsulates platform specific style hints
like doubleClickInterval or cursorFlashTime.

Change-Id: I0d88c47a59d564d8d346642184e5b14e1864cf40
Reviewed-on: http://codereview.qt.nokia.com/3927
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMove the qmljsdebugargument variable to QGuiApplication
Lars Knoll [Tue, 30 Aug 2011 11:15:56 +0000 (13:15 +0200)]
Move the qmljsdebugargument variable to QGuiApplication

This used to reside in QApplication, but we need it here
to remove a dependency of QtDeclarative onto widgets.

Change-Id: I119fef1d51387087b00e08aff1ee4b00503a6cd5
Reviewed-on: http://codereview.qt.nokia.com/3926
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoTouch event support for QWindow.
Laszlo Agocs [Wed, 31 Aug 2011 08:30:45 +0000 (11:30 +0300)]
Touch event support for QWindow.

Change-Id: I83ddc48a9093856d975b25f0426db96264afeeef
Reviewed-on: http://codereview.qt.nokia.com/3920
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMoving relevant tests to corelib/io
Holger Ihrig [Wed, 24 Aug 2011 10:53:32 +0000 (12:53 +0200)]
Moving relevant tests to corelib/io

Marked Test for qdiriterator as insignificant. See QTBUG-21160

Marked Test for qresourceengine as insignificant. See QTBUG-21159

Task-number: QTBUG-21066

Change-Id: I72848a651ff3e7aff1d6105dd49124e4ed070a44
Reviewed-on: http://codereview.qt.nokia.com/3577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFixed hellowindow making context current in wrong thread.
Samuel Rødal [Wed, 31 Aug 2011 07:14:00 +0000 (09:14 +0200)]
Fixed hellowindow making context current in wrong thread.

Make the context a child of the Renderer, which is already moved to the
correct thread.

Change-Id: Iafda090e15b322c03e2c10b1905050f636b90197
Reviewed-on: http://codereview.qt.nokia.com/3915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMerge branch 'master' into refactor
Gunnar Sletta [Wed, 31 Aug 2011 06:14:48 +0000 (08:14 +0200)]
Merge branch 'master' into refactor

12 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>
12 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>
12 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>
12 years agoFix build from scratch.
Friedemann Kleint [Tue, 30 Aug 2011 14:41:42 +0000 (16:41 +0200)]
Fix build from scratch.

Change-Id: Ifd958a51da2dbaf6afc24ef6a10f8d29e0f5f6d2
Reviewed-on: http://codereview.qt.nokia.com/3888
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 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>
12 years agopick up the target window for a mouse event when none is specified
Gunnar Sletta [Tue, 30 Aug 2011 13:00:38 +0000 (15:00 +0200)]
pick up the target window for a mouse event when none is specified

Change-Id: Iae0402f63f39a2728b94abe68fa22592d97ea9f3
Reviewed-on: http://codereview.qt.nokia.com/3885
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoMoving relevant tests to corelib/global
Holger Ihrig [Wed, 24 Aug 2011 10:13:20 +0000 (12:13 +0200)]
Moving relevant tests to corelib/global

Task-number: QTBUG-21066

Change-Id: I011e601f599e11365c76598631a443b82ab9fb30
Reviewed-on: http://codereview.qt.nokia.com/3487
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoMoving relevant tests to corelib/concurrent
Holger Ihrig [Wed, 24 Aug 2011 08:51:34 +0000 (10:51 +0200)]
Moving relevant tests to corelib/concurrent

Adding tests for QFutureSynchronizer and QtConcurrentResultStore

Added minor things in QFutureSynchronizer and QtConcurrentResultStore and removed tests for destruction

Task-number: QTBUG-21066

Change-Id: I9f088b89463340f339c914bcb37fb2f9d3b62057
Reviewed-on: http://codereview.qt.nokia.com/3477
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 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>
12 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>
12 years agoCocoa: Make the hellowindow opengl example work.
Morten Sorvig [Tue, 30 Aug 2011 08:41:54 +0000 (10:41 +0200)]
Cocoa: Make the hellowindow opengl example work.

You're not supposed to use NSOpenGLView and
NSOpenGLContext at the same time - it's one or
the other. Qmlscene worked because it was hitting
the raster path that doesn't have a NSOpenGLView.

Remove the NSOpenGLView path and m_windowSurfaceView.

Change-Id: I10358851a94cd1780a312af09bbb7cf5db8f984f
Reviewed-on: http://codereview.qt.nokia.com/3862
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMerge remote branch 'gerrit/master' into refactor
Samuel Rødal [Tue, 30 Aug 2011 09:51:17 +0000 (11:51 +0200)]
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/src.pro

Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf

12 years agoRename remaining gui/opengl source files to avoid name clashing.
Samuel Rødal [Tue, 30 Aug 2011 08:36:25 +0000 (10:36 +0200)]
Rename remaining gui/opengl source files to avoid name clashing.

We don't want to have source files in the opengl module and gui with the
same name, at least not private headers.

Change-Id: I5f2bf629c943a67a405574fb148aa4c70e58ecbb
Reviewed-on: http://codereview.qt.nokia.com/3864
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoCause fatal error when trying to make a context current in wrong thread.
Samuel Rødal [Tue, 30 Aug 2011 08:12:46 +0000 (10:12 +0200)]
Cause fatal error when trying to make a context current in wrong thread.

Since QOpenGLContext is now a QObject, it needs to be moved to, or
created in, the thread where it's going to be used.

Change-Id: I7ed12b25e75c84bb12be8c7102e46e9a242fc2df
Reviewed-on: http://codereview.qt.nokia.com/3858
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoAdded some documentation for internal OpenGL resource handling classes.
Samuel Rødal [Tue, 30 Aug 2011 08:14:39 +0000 (10:14 +0200)]
Added some documentation for internal OpenGL resource handling classes.

Change-Id: Ib9a9442199a29d5781013155190ad0f20741198e
Reviewed-on: http://codereview.qt.nokia.com/3859
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 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>
12 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>
12 years agoTests: Add widgets module to profile.
Friedemann Kleint [Mon, 29 Aug 2011 13:33:59 +0000 (15:33 +0200)]
Tests: Add widgets module to profile.

Ensure the right test macro is run.

Change-Id: I84d58038f25b000c05fd52e8bda92e4484d53a6e
Reviewed-on: http://codereview.qt.nokia.com/3805
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoBuild on Windows/clean build on Linux.
Friedemann Kleint [Mon, 29 Aug 2011 12:13:08 +0000 (14:13 +0200)]
Build on Windows/clean build on Linux.

Change-Id: I26552e85a8e8c63002db93b7d9b645981620f0af
Reviewed-on: http://codereview.qt.nokia.com/3738
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoCocoa: Fix qmlscene flicker on resize.
Morten Sorvig [Wed, 24 Aug 2011 06:13:44 +0000 (08:13 +0200)]
Cocoa: Fix qmlscene flicker on resize.

Update the GL context before sending the geometry
change event to Qt.

Change-Id: If331bfcc7f7b0fd4f2f24d4445c8197ec6af688f
Reviewed-on: http://codereview.qt.nokia.com/3448
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoMake plain executables foreground processes.
Morten Sorvig [Tue, 23 Aug 2011 07:23:07 +0000 (09:23 +0200)]
Make plain executables foreground processes.

Non-bundled executables are started as background
processes which does not have a dock icon or a task
switcher entry. This is generally not what we want
for Qt gui applications so change the process type.

Change-Id: I0d29eb9b70655e95bc0b9500803fbf3955d264e4
Reviewed-on: http://codereview.qt.nokia.com/3387
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoCocoa: Load the standard app menu.
Morten Sorvig [Mon, 22 Aug 2011 11:43:42 +0000 (13:43 +0200)]
Cocoa: Load the standard app menu.

It's now possible to quit and hide the app window
using the keyboard shortcuts.

The menu nib files are now stored in Qt resources,
written to QDir::temp at app startup and loaded
from there. This will simplify deployment compared
with Qt 4 where the nibs had to be copied into the
QtGui framework when deploying the app.

This change also moves the mac resources
(qt_menu.nib, cursors) from widgets to the cocoa
plugin.

Change-Id: If1d6fd353369ea4e89a9e35579906a2de7298fa2
Reviewed-on: http://codereview.qt.nokia.com/3314
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoAdded qopengl auto-test.
Samuel Rødal [Mon, 29 Aug 2011 10:26:08 +0000 (12:26 +0200)]
Added qopengl auto-test.

For testing the gui/opengl functionality.

Change-Id: Ied0e977ad537c0be301bb08091adaf9cf779306b
Reviewed-on: http://codereview.qt.nokia.com/3729
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMerge "Merge remote branch 'gerrit/master' into refactor" into refactor
Gunnar Sletta [Mon, 29 Aug 2011 10:15:31 +0000 (12:15 +0200)]
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor

12 years agoMerge remote branch 'gerrit/master' into refactor
Samuel Rødal [Mon, 29 Aug 2011 10:11:53 +0000 (12:11 +0200)]
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/gui/accessible/qaccessible.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_mac.mm
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qdnd_x11.cpp
src/gui/kernel/qwidget.cpp
src/gui/widgets/qlabel.cpp

Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba

12 years agoCompile without QT_DEBUG.
Morten Sorvig [Mon, 29 Aug 2011 09:59:07 +0000 (11:59 +0200)]
Compile without QT_DEBUG.

Change-Id: I3dadcdd83f45451d712703601d46adbc1691291b
Reviewed-on: http://codereview.qt.nokia.com/3727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoGet cocoa plugin compiling after OpenGL refactoring
Gunnar Sletta [Mon, 29 Aug 2011 08:48:03 +0000 (10:48 +0200)]
Get cocoa plugin compiling after OpenGL refactoring

Change-Id: I9de6de9e633c1355d45c0851c1df94e707b62927
Reviewed-on: http://codereview.qt.nokia.com/3721
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoClean up legacy defines in gui/opengl.
Samuel Rødal [Mon, 29 Aug 2011 08:22:28 +0000 (10:22 +0200)]
Clean up legacy defines in gui/opengl.

Change-Id: I14d477c3f7a98cecca2c0a240ff13ea8ec64a154
Reviewed-on: http://codereview.qt.nokia.com/3716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoCopy core GL functionality to QtGui with QGL -> QOpenGL naming.
Samuel Rødal [Mon, 22 Aug 2011 08:49:28 +0000 (10:49 +0200)]
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.

Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMove GL resource handling enablers to QtGui.
Samuel Rødal [Tue, 16 Aug 2011 07:29:44 +0000 (09:29 +0200)]
Move GL resource handling enablers to QtGui.

Made resource handling more robust by attempting to free GL resources in
the correct thread, and not forcing a context to become current to free
resources.

Change-Id: Ie81d4005b608972375755571d9b50ce82080709b
Reviewed-on: http://codereview.qt.nokia.com/3258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 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>
12 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>
12 years agoAlways relay configure notify events from XCB plugin.
Samuel Rødal [Fri, 26 Aug 2011 08:31:02 +0000 (10:31 +0200)]
Always relay configure notify events from XCB plugin.

QWindow no longer sets its geometry member in setGeometry(), so it needs
to happen through handleGeometryChange() from the platform plugin.

Change-Id: Ia22b788c65dba4fc4b1efed1965ccd9473f1f743
Reviewed-on: http://codereview.qt.nokia.com/3709
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agotest: removed obsolete tst_maketestselftest::tests_auto_pro
Rohan McGovern [Sun, 28 Aug 2011 23:24:37 +0000 (09:24 +1000)]
test: removed obsolete tst_maketestselftest::tests_auto_pro

This test attempted to ensure that tests/auto/auto.pro would only refer
to other .pro files, attempting to guarantee that the set of all tests
could be cleanly broken up.  The purpose of this was to enable CI
optimizations (e.g. running the autotests for different modules on
different machines in parallel).

This test is invalidated by pending commits which rearrange the
autotests, and we never made use of this property for optimization
anyway, so drop this part of the test.

Change-Id: I23e712fb8ec1dbe7ac65fe66015e1f060f3dcd41
Reviewed-on: http://codereview.qt.nokia.com/3681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
12 years agoQWindow::mapToGlobal/mapFromGlobal and move()
Gunnar Sletta [Mon, 29 Aug 2011 06:26:37 +0000 (08:26 +0200)]
QWindow::mapToGlobal/mapFromGlobal and move()

Change-Id: If1909b9ce468a8708cb25d5a2fbe8ebd90bd958a
Reviewed-on: http://codereview.qt.nokia.com/3702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agoBe more consistent when including private headers.
Jason McDonald [Wed, 24 Aug 2011 08:03:56 +0000 (18:03 +1000)]
Be more consistent when including private headers.

Change-Id: I0fdc014391ff34ba3be9501c2e73bd5357df1f5e
Reviewed-on: http://codereview.qt.nokia.com/3467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove mode parameter from QTestLog::addSkip().
Jason McDonald [Thu, 25 Aug 2011 02:53:07 +0000 (12:53 +1000)]
Remove mode parameter from QTestLog::addSkip().

The mode parameter is never used by the logging code, so there's little
value in passing it there.

Change-Id: Ibe2cbe5eaf457a7e3ffd3aea3a4be7c8278c91b6
Reviewed-on: http://codereview.qt.nokia.com/3547
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix broken header file guard.
Jason McDonald [Wed, 24 Aug 2011 03:41:43 +0000 (13:41 +1000)]
Fix broken header file guard.

Change-Id: I6db5be5289b271be24a4a9d77c5f2a1e9f560d2d
Reviewed-on: http://codereview.qt.nokia.com/3434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix typo in enum name.
Jason McDonald [Wed, 24 Aug 2011 05:23:07 +0000 (15:23 +1000)]
Fix typo in enum name.

Change-Id: I2eccbd3b9dd31aa5e869d622055f9235f90c0c03
Reviewed-on: http://codereview.qt.nokia.com/3445
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix minor formatting issues.
Jason McDonald [Thu, 25 Aug 2011 05:06:26 +0000 (15:06 +1000)]
Fix minor formatting issues.

Change-Id: I66767e906c54988ca0d0e2823b1a396993ba06f2
Reviewed-on: http://codereview.qt.nokia.com/3624
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove QTestFileLogger class.
Jason McDonald [Tue, 23 Aug 2011 08:35:27 +0000 (18:35 +1000)]
Remove QTestFileLogger class.

This class is not very useful -- it just creates a text file that
records each occasion that an autotest enters a test function as a
stop-gap solution for the fact that the newer XML logger produces no
output if the autotest fails to terminate gracefully.  Addressing
QTBUG-20615 will provide a better solution by allowing the user to get a
partial plain text test log in those circumstances.

Change-Id: I179bb98dbd696d0734cd3f12046e5c567def30cc
Reviewed-on: http://codereview.qt.nokia.com/3390
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove ability to change XML logger during a test.
Jason McDonald [Fri, 26 Aug 2011 01:44:17 +0000 (11:44 +1000)]
Remove ability to change XML logger during a test.

It doesn't make sense to change the logger associated with a streamer in
the middle of a test run, so only allow the logger to be set when
constructing a streamer.

Change-Id: I02661de2b6071c74d10bc854cbe436581978d2d9
Reviewed-on: http://codereview.qt.nokia.com/3622
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoEnable multiple instances of QAbstractTestLogger.
Jason McDonald [Thu, 25 Aug 2011 08:20:19 +0000 (18:20 +1000)]
Enable multiple instances of QAbstractTestLogger.

Previously QAbstractTestLogger used a global variable for the file
pointer to which it was writing test output.  This effectively meant
that only one instance of this or its derived classes could exist at any
time.

This commit moves the file pointer inside the class, so that multiple
loggers can exist at the same time.  This means that the outputString()
method can no longer be static, which in turn means that several
functions used by QPlainTestLogger need to move from the QTest namespace
into the class, and also that QTestBasicStreamer must hold a non-const
pointer to its associated logger instead of a const pointer.

Task-number: QTBUG-20615
Change-Id: If941f1f9399cf20fb93e3e87f3390bceeca1cbfc
Reviewed-on: http://codereview.qt.nokia.com/3576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove color logging feature from qtestlib.
Jason McDonald [Wed, 24 Aug 2011 01:39:34 +0000 (11:39 +1000)]
Remove color logging feature from qtestlib.

This feature was undocumented and only worked if a secret environment
variable was set, the test output was going to a real console, and plain
text test results were being generated.  Including code in testlib for
fancy presentation of test results conflicts with testlib's stated goal
of being a lightweight framework where every feature contributes to
finding bugs, so this feature is being removed.  If fancy presentation
of test output is required, it should be achieved by post-processing the
test output outside of the test framework.

Change-Id: I872165c4d2c3d2498c3aa039070ecf319e237ca1
Reviewed-on: http://codereview.qt.nokia.com/3432
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove circular dependency in testlib logging code
Jason McDonald [Wed, 24 Aug 2011 07:14:21 +0000 (17:14 +1000)]
Remove circular dependency in testlib logging code

Pass the output file name from the QTestLog to the test logger when
commencing logging rather than having the logger call back into the
QTestLog.

Change-Id: Id484635f9fcfca08a66c92f3442887e9473b6f9b
Reviewed-on: http://codereview.qt.nokia.com/3454
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:33 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

Change-Id: I8d0ff9cad1da7df3e5e0d18e8f19b17b468afc01
Reviewed-on: http://codereview.qt.nokia.com/3368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix typo for ifdef QT_NO_ACCESSIBILITY
Frederik Gladhorn [Fri, 29 Jul 2011 21:43:01 +0000 (14:43 -0700)]
Fix typo for ifdef QT_NO_ACCESSIBILITY

Reviewed-by: TrustMe
(cherry picked from commit eaf3b5ff76e4866ef3597110c6e565305c3298ad)

Change-Id: I21df13a24fc5d339c5fcbf38f151c0339e1c87a9
Reviewed-on: http://codereview.qt.nokia.com/3042
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoCall QAccessible::updateAccessibility when a widget is deleted
José Millán Soto [Fri, 29 Jul 2011 17:35:54 +0000 (10:35 -0700)]
Call QAccessible::updateAccessibility when a widget is deleted

Merge-request: 1310
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
(cherry picked from commit df3f763920b1450733817596148e087d11c0c543)

Change-Id: I74fb08104c5dc527f9e9ac88776e4aa2623a3385
Reviewed-on: http://codereview.qt.nokia.com/3041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoCall QAccessible::updateAccessibility when setText is called on QLabel
José Millán Soto [Thu, 14 Jul 2011 12:25:57 +0000 (14:25 +0200)]
Call QAccessible::updateAccessibility when setText is called on QLabel

The method is called when the text of a label is changed and setAccessibleName has
not been called on the label, as the text of the label acts as the accessible name
of the label.

Merge-request: 1301
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
(cherry picked from commit a1f2b68e97477440cf508e6d497eb5f5d9971971)

Change-Id: Ic10f75e72ac3faa84777c444177b287b720a1dc2
Reviewed-on: http://codereview.qt.nokia.com/3040
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoIncorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
José Millán Soto [Sun, 12 Jun 2011 22:31:38 +0000 (00:31 +0200)]
Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue

Merge-request: 1263
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
(cherry picked from commit 031958c130904c16a4bafa5617aaa197469efa9e)

Change-Id: I0639f90271b80392e9bcf7f0e4ddaf0f3cd6b478
Reviewed-on: http://codereview.qt.nokia.com/3039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoCheck if bridge plugin vector is still valid.
Frederik Gladhorn [Fri, 26 Aug 2011 08:33:20 +0000 (10:33 +0200)]
Check if bridge plugin vector is still valid.

Q_GLOBAL_STATIC may be destroyed and we still send
ObjectDestroyed notifications.
This only shows now that we actually send the Destroyed notifications.

Change-Id: I3057556cdc897dab6adfc3274e4abc68473ffa7f
Reviewed-on: http://codereview.qt.nokia.com/3657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoFix crash when fallback font is not #0 in multi font engine
Eskil Abrahamsen Blomfeldt [Fri, 26 Aug 2011 06:07:20 +0000 (08:07 +0200)]
Fix crash when fallback font is not #0 in multi font engine

Easily reproducible by testing Chinese with the threaded
renderer. The multi engine would then have a list of engines
with a single item, but the glyphs might belong to e.g. engine
11. In that case, engine() would assert when it couldn't find
the engine if the layout had been done in a different thread.
We force the loading of the required engine if it's not already
loaded.

Note that this fix does not work on Mac, as loadEngine() will
crash there, so the layout has to be done in the same thread
as the rendering, since loading the engines is part of the
layout process.

Task-number: QTBUG-21112
Change-Id: I71cc396664e3b95fbb4815a90873457e1f89528e
Reviewed-on: http://codereview.qt.nokia.com/3631
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agooptimize parsing of templates like p{IsArabic}, etc
Ritt Konstantin [Fri, 15 Jul 2011 02:00:05 +0000 (06:00 +0400)]
optimize parsing of templates like p{IsArabic}, etc

use qBinaryFind() with a case-sensitive string comparison
instead of QHash. This also improves startup time and reduces
runtime memory consumption.

Change-Id: I5c5f7cae5e42acb3fa727acac19fe39c53310329
Reviewed-on: http://codereview.qt.nokia.com/3673
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agooptimize parsing of templates like p{L}, p{Lu}, etc
Ritt Konstantin [Fri, 15 Jul 2011 00:29:03 +0000 (04:29 +0400)]
optimize parsing of templates like p{L}, p{Lu}, etc

replacing the if-else trees with the switch statement
gives a 2x-3x parsing performance boost on parsing these
expressions.

Change-Id: Ia0e76ae4e1ab6930dbecf1d4a5232a4cc7198654
Reviewed-on: http://codereview.qt.nokia.com/3672
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agodon't build code related to CClass if QT_NO_REGEXP_CCLASS is defined
Ritt Konstantin [Fri, 15 Jul 2011 00:30:33 +0000 (04:30 +0400)]
don't build code related to CClass if QT_NO_REGEXP_CCLASS is defined

Change-Id: If86835b1065eeb95e0774f1b42870dcd5225da58
Reviewed-on: http://codereview.qt.nokia.com/3671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agodirectfb: Follow coding standards, add hints of memleaks, remove vars
Holger Hans Peter Freyther [Wed, 24 Aug 2011 17:25:19 +0000 (01:25 +0800)]
directfb: Follow coding standards, add hints of memleaks, remove vars

Use m_ for all member variables, document some classes that appear
to lack proper destruction, remove unused variables from classes.

Change-Id: Icec451149fa5d562d8d5f54cbe9a1aa1518bfc48
Reviewed-on: http://codereview.qt.nokia.com/3667
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agodirectfb: Convert the directfb plugin, disable the OpenGL support
Holger Hans Peter Freyther [Wed, 24 Aug 2011 16:55:51 +0000 (00:55 +0800)]
directfb: Convert the directfb plugin, disable the OpenGL support

OpenGL was never tested and the platform integration has changed,
remove it from the build and re-enable it once one can test it.

Change-Id: I70d5b5b11de06e6e999d3aae44660f11d2dbc719
Reviewed-on: http://codereview.qt.nokia.com/3666
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoxcb: Disable GLX when xcb-xlib is not present due xlib usage
Holger Hans Peter Freyther [Wed, 24 Aug 2011 13:12:35 +0000 (21:12 +0800)]
xcb: Disable GLX when xcb-xlib is not present due xlib usage

The GLX and EGL code is using DISPLAY_FROM_XCB which requires
xlib support, disable GLX when when xlib is not present.

Change-Id: I55126e48e52390fdcfb1348a11fbf9628d32b13c
Reviewed-on: http://codereview.qt.nokia.com/3665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoxcb: Be able to compile without xlib support
Holger Hans Peter Freyther [Wed, 24 Aug 2011 13:09:16 +0000 (21:09 +0800)]
xcb: Be able to compile without xlib support

Use XCB types for events instead of indirectly depending
on Xlib includes because of the GLX includes. Manually verified
the right values.

ButtonPressMask (1L<<2)
XCB_EVENT_MASK_BUTTON_PRESS = 4,

define ButtonReleaseMask (1L<<3)
XCB_EVENT_MASK_BUTTON_RELEASE = 8,

ButtonMotionMask (1L<<13)
XCB_EVENT_MASK_BUTTON_MOTION = 8192,

EnterWindowMask (1L<<4)
XCB_EVENT_MASK_ENTER_WINDOW = 16,

LeaveWindowMask (1L<<5)
XCB_EVENT_MASK_LEAVE_WINDOW = 32,

PointerMotionMask (1L<<6)
XCB_EVENT_MASK_POINTER_MOTION = 64,

GrabModeAsync 1
XCB_GRAB_MODE_ASYNC = 1

Change-Id: I1fade68947b1e2f39ca3514573c10fae7ee2dfb1
Reviewed-on: http://codereview.qt.nokia.com/3664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoTemporarily disable printers on Windows, fix export.
Friedemann Kleint [Fri, 26 Aug 2011 09:46:28 +0000 (11:46 +0200)]
Temporarily disable printers on Windows, fix export.

Change-Id: I351692b53cf559cd3be64cec8907bd544ba41593
Reviewed-on: http://codereview.qt.nokia.com/3653
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
12 years agoIntroduce new test macro for GUI applications.
Friedemann Kleint [Thu, 25 Aug 2011 14:34:40 +0000 (16:34 +0200)]
Introduce new test macro for GUI applications.

Fixing linkage of the coreanimation examples on Windows.

Change-Id: Ic34cab329577b2ba430ca8a510b356c424d574af
Reviewed-on: http://codereview.qt.nokia.com/3605
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix some compiler warnings, shut up QIbusPlatformInputContext.
Friedemann Kleint [Fri, 26 Aug 2011 08:02:43 +0000 (10:02 +0200)]
Fix some compiler warnings, shut up QIbusPlatformInputContext.

Change-Id: Idadf40b2bbe53928d8577a099f38a2be0a2d6e16
Reviewed-on: http://codereview.qt.nokia.com/3640
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoIntroduce new platform capability ThreadedOpenGL.
Samuel Rødal [Thu, 25 Aug 2011 18:19:44 +0000 (20:19 +0200)]
Introduce new platform capability ThreadedOpenGL.

Lets the platform plugin advertise whether it's safe to use OpenGL from
a different thread. With XCB we only advertise this if we have a
reasonably new XCB libary, as older versions suffer from the
xcb_wait_for_reply() blocking bug, which cause GL rendering in a
separate to stall when using Mesa drivers.

Change-Id: I4829df7e583a1c8aed218ae13a159d21266cc594
Reviewed-on: http://codereview.qt.nokia.com/3613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>