profile/ivi/qtbase.git
12 years agoTest that options to macros work.
Stephen Kelly [Mon, 5 Dec 2011 01:46:22 +0000 (02:46 +0100)]
Test that options to macros work.

Change-Id: Id2f57cc2f64ae25f5f84d1206035b7a2c309d1c7
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix tst_QSharedPointer invalidConstructs:forward-declaration failure
Bradley T. Hughes [Tue, 6 Dec 2011 12:34:15 +0000 (13:34 +0100)]
Fix tst_QSharedPointer invalidConstructs:forward-declaration failure

When using clang, the forward-declaration test fails to link, unlike
with other compilers. The standard says that deleting a forward-declared
pointer is undefined behavior, so the link failure is a valid result of
trying to do so.

Change-Id: I527b91c15b7d51d9522d95af0630e7dacd26bb30
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agosyncqt: fixed QT_MODULE_BASE when build path != install path
Rohan McGovern [Wed, 23 Nov 2011 01:44:47 +0000 (11:44 +1000)]
syncqt: fixed QT_MODULE_BASE when build path != install path

QT_MODULE_BASE is exclusively used to refer to the top-level source
directory of a module.  However, in non-developer-build mode (used
only when the build path is not equal to the install path), syncqt
would incorrectly set the value of QT_MODULE_BASE to the build
directory.  This caused all $$QT.<module>.sources variables to point
to the wrong place.

Make it always point to the source directory.

Change-Id: I401cf000f9e3a4ab97d68db40330bb98aec25a9a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoExecuting 'make install' did not build mkv8snapshot
Jyri Tahtela [Thu, 24 Nov 2011 06:50:37 +0000 (16:50 +1000)]
Executing 'make install' did not build mkv8snapshot

During shadow-building it was noticed that executing make install
did not actually build mkv8snapshot and therefore caused an error.

Change-Id: I126cdbaffb85170e25412b93bc99af79ac6f4642
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoRemove the QT_THREAD_SUPPORT defines
Bradley T. Hughes [Tue, 6 Dec 2011 11:20:54 +0000 (12:20 +0100)]
Remove the QT_THREAD_SUPPORT defines

These are no longer used. Qt 3.x used them to enable thread support
(which was optional at the time), but starting with 4.0, thread support
is always enabled, and these defines were removed from the code.

Change-Id: I4d1c75171c263383fc055d2a7fe52ca0501acd7a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoPort to CMakeParseArguments from a custom rolled macro.
Stephen Kelly [Mon, 5 Dec 2011 01:06:21 +0000 (02:06 +0100)]
Port to CMakeParseArguments from a custom rolled macro.

Change-Id: Ia7bf5046420ee8f2d690d098937a212eb75b07ce
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoTest the qt5_add_resource macro.
Stephen Kelly [Mon, 5 Dec 2011 01:19:55 +0000 (02:19 +0100)]
Test the qt5_add_resource macro.

Change-Id: I94e4c9e525016405abba90bbdbe58e7786ce5bc4
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoNow that qt5_automoc doesn't exist, this macro is not needed.
Stephen Kelly [Sat, 3 Dec 2011 21:49:37 +0000 (22:49 +0100)]
Now that qt5_automoc doesn't exist, this macro is not needed.

Change-Id: I4746ed5ba41fba801599f443d1214e1744807e20
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRevert "Add valgrind suppression files."
Morten Johan Sørvig [Mon, 28 Nov 2011 10:00:55 +0000 (11:00 +0100)]
Revert "Add valgrind suppression files."

This reverts commit f73e42369a5b4ba43cb8dc8cbcc6232e4375306c

This is a work in progress and is not useful yet. Cocoa/Objective C generates a lot of errors which is making creating a suppression file harder than I initially anticipated.

Change-Id: I045ba1eb9ae627a063a09422f6b5c2bfe6a225ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoSkip untestable interfaces in QTcpSocket::bind autotest
Shane Kearns [Fri, 2 Dec 2011 11:10:02 +0000 (11:10 +0000)]
Skip untestable interfaces in QTcpSocket::bind autotest

bind() test failed if there is an autoconfigured IPv4 address.
e.g. bluetooth adaptor that is not attached to a network.
Or WLAN adaptor in peer-peer mode.
- solved by skipping the autoconfigured IPv4 addresses in the same way
  as IPv6 addresses are already skipped

bind() test fails for proxy
- skipped, QTBUG-22964 created

Change-Id: I9a799ae8db421783f474e97cf876d6e265516397
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoUse plural form for CMake variables.
Stephen Kelly [Sat, 3 Dec 2011 22:00:12 +0000 (23:00 +0100)]
Use plural form for CMake variables.

Change-Id: Idc0cd360e09046a5746c9f7366c7fd4b982058fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRemove CMake variables which are not needed in Config files.
Stephen Kelly [Sat, 3 Dec 2011 21:59:23 +0000 (22:59 +0100)]
Remove CMake variables which are not needed in Config files.

Change-Id: I8f6795f1d40983af0478270f33ab1c06abe67133
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAsk for a context that is likely to be supported.
Gunnar Sletta [Tue, 6 Dec 2011 07:30:40 +0000 (08:30 +0100)]
Ask for a context that is likely to be supported.

Most embedded GL chips support 24-bit depth with packed
8 bit stencil, but more rarely 32-bit. Asking for 32
bit means we often fail on other properties to, such as
multisampling.

Change-Id: Ib913d94af0635b09913ff15cff54cc694ba293fc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove obsolete autotest parameters.
Jason McDonald [Tue, 6 Dec 2011 00:48:52 +0000 (10:48 +1000)]
Remove obsolete autotest parameters.

Previously, autotests silently ignored the -graphicssystem and -qws
parameters so that test-runners did not need to include logic to decide
whether to pass those parameters depending on whether a particular test
was a GUI test or a non-GUI test.

In Qt 5, both of those parameters have been removed from QApplication,
so tests don't need to ignore them anymore as they should no longer be
supplied to any test.

Change-Id: Ic59e38ddfa3303e760645ed1782a211340ce70f2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove TESTED_CLASS/TESTED_FILES comments from tests.
Jason McDonald [Mon, 5 Dec 2011 08:51:14 +0000 (18:51 +1000)]
Remove TESTED_CLASS/TESTED_FILES comments from tests.

These comments were mostly empty or inaccurate.  Appropriate naming of
tests and appropriate placement of tests within the directory tree
provide more reliable indicators of what is being tested.

Change-Id: Ib6bf373d9e79917e4ab1417ee5c1264a2c2d7027
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't mark selftest subtests as testcases.
Jason McDonald [Mon, 5 Dec 2011 07:57:02 +0000 (17:57 +1000)]
Don't mark selftest subtests as testcases.

The subtests are intended to be executed by tst_selftests and therefore
don't need to have "CONFIG += testcase", which causes 'make check" to
treat them as stand-alone tests.

Change-Id: I1b47e0186be99c591bb1e03bbec6386518f8a449
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd new mkspec for cross-compiling Qt5 for ARM
Jyri Tahtela [Mon, 5 Dec 2011 04:56:28 +0000 (14:56 +1000)]
Add new mkspec for cross-compiling Qt5 for ARM

This mkspec provides default compiler settings for cross-compiling
Qt5 for ARM.

Change-Id: If58a1833141ab305bd57928796f7444e9b7aa2b3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix QT_DEPRECATED_SINCE evaluation
Bradley T. Hughes [Mon, 5 Dec 2011 12:05:44 +0000 (13:05 +0100)]
Fix QT_DEPRECATED_SINCE evaluation

QT_DEPRECATED is defined by default by the logic in qglobal.h, but
QT_DEPRECATED_SINCE is evaluated before that definition, making
QT_DEPRECATED_SINCE evaluate to 0, disabling all deprecated code (even
though it shouldn't be disabled).

Fix this by moving the QT_DEPRECATED_SINCE evaluation to after the
evaluation of QT_NO_DEPRECATED and/or definition of QT_DEPRECATED, to
ensure that QT_DEPRECATED_SINCE works as expected.

Change-Id: I57d9f6a3e1859b0057fd4f37bcf2d2cc3dfba230
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRe-add QInternal::EventNotifyCallback
Bradley T. Hughes [Mon, 5 Dec 2011 12:46:39 +0000 (13:46 +0100)]
Re-add QInternal::EventNotifyCallback

This is needed by QtScript, so we need to keep it for now.

Change-Id: Iee6bd7daf7e86a09242523f5aca72ede413a6981
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake tst_QVariant::canConvertMetaTypeToInt more verbose.
Jędrzej Nowacki [Tue, 29 Nov 2011 16:05:24 +0000 (17:05 +0100)]
Make tst_QVariant::canConvertMetaTypeToInt more verbose.

Change-Id: If17cbd1154c4fd3c006648b28e91a009de5b373b
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoqpixmap_win.cpp: Fix typo in format conversion (alpha).
Friedemann Kleint [Mon, 5 Dec 2011 14:06:42 +0000 (15:06 +0100)]
qpixmap_win.cpp: Fix typo in format conversion (alpha).

Change-Id: I8abdae5482e94a7f9af494e5d547352431285336
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agov8: Introduce MIPS code for the QML code
Holger Hans Peter Freyther [Mon, 5 Dec 2011 11:06:01 +0000 (19:06 +0800)]
v8: Introduce MIPS code for the QML code

Copy and paste the ARM code into the MIPS dir, there is no lithium
support in MIPS right now.

Change-Id: I21491d36da2a4ac4cb6898c47b0e5bd37a733b41
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agov8: Attempt to fix a typo in the commit message
Holger Hans Peter Freyther [Mon, 5 Dec 2011 11:00:46 +0000 (19:00 +0800)]
v8: Attempt to fix a typo in the commit message

is resolve -> is resolved

Change-Id: I95a6072be63e353bafdafccc404e90d331a01894
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agomips: Really build the MIPS V8 code
Holger Hans Peter Freyther [Mon, 5 Dec 2011 10:55:16 +0000 (18:55 +0800)]
mips: Really build the MIPS V8 code

2008d2d40ed10baf94acb9103b85f3bf6e2f655a was not rebased properly and
should have used the V8_TARGET_ARCH to add the MIPS code to the build.

Change-Id: Idf0c183fca63da0fa9f9aa8d091a764b88c888f5
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoFix typos in Sqlite docs.
Stephen Kelly [Thu, 1 Dec 2011 18:22:22 +0000 (19:22 +0100)]
Fix typos in Sqlite docs.

Change-Id: I4a57e9e37831c135b1ad620c8c9586a5eea76220
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFixing naming of selftests.
Jason McDonald [Mon, 5 Dec 2011 05:00:51 +0000 (15:00 +1000)]
Fixing naming of selftests.

Make the test object names correspond to the test program names, so that
it is easier to see which test produced each block of test output.

Change-Id: Ib19a955938b549f27cdcaac83bfa9150285b396d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't set graphics system at start of test.
Jason McDonald [Mon, 5 Dec 2011 04:10:01 +0000 (14:10 +1000)]
Don't set graphics system at start of test.

QApplication::setGraphicsSystem() is a no-op, and even if it wasn't it
would be unwise to force a graphics system that isn't guaranteed to be
included in the Qt build, without including any logic to skip the test
if setting the graphics system failed.

Change-Id: Id9a0a87586872088625de7840b5032d0c3cc48a1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFixed tst_selftests findtestdata subtest for shadow builds.
Rohan McGovern [Mon, 5 Dec 2011 04:08:22 +0000 (14:08 +1000)]
Fixed tst_selftests findtestdata subtest for shadow builds.

This test uses qt.conf to enforce a predictable tests install location.
This was not working in the shadow build case, as qt.conf was only
present in the source tree; embed it as a resource at :/qt/etc/qt.conf
so it works in the shadow build case too.

Change-Id: Iec708d9686c29a1fc5ff0020dc11a93a593d20c5
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRemove unused Mac specific font code in widgets
Jiang Jiang [Thu, 1 Dec 2011 10:30:35 +0000 (11:30 +0100)]
Remove unused Mac specific font code in widgets

Change-Id: If7a81b8b59aedcc0ba54c735787a220bab9ca535
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoRemove QCoreTextFontEngineMulti
Jiang Jiang [Thu, 1 Dec 2011 10:26:53 +0000 (11:26 +0100)]
Remove QCoreTextFontEngineMulti

It's not used anymore since we have switch to HarfBuzz on Mac.

Change-Id: I68252fbe3021f54dacac5a901184c3f3e541a6b7
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoEnable subpixel rendering for raster on Mac
Jiang Jiang [Thu, 1 Dec 2011 10:21:28 +0000 (11:21 +0100)]
Enable subpixel rendering for raster on Mac

Change-Id: I06e6465e03c17776974d361254abf5b750736080
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoMove the metatype declaration for QGraphicsScene.
Stephen Kelly [Sat, 3 Dec 2011 21:50:18 +0000 (22:50 +0100)]
Move the metatype declaration for QGraphicsScene.

From where it is forward declared to where it is fully defined.

Change-Id: Ie2240ffef6d1edbbbd5b193f9528ef94ef412d82
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove unused enum values.
Frederik Gladhorn [Thu, 1 Dec 2011 18:21:26 +0000 (19:21 +0100)]
Remove unused enum values.

These were used for foreground/background color.
Since we have proper functions for these two now,
the hack with invoke_method is no longer needed.

Change-Id: I66eb645124caa838adb1ceb41383a2724a45f553
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoQuote the path in CMake so that spaces in paths work.
Stephen Kelly [Fri, 2 Dec 2011 12:56:36 +0000 (13:56 +0100)]
Quote the path in CMake so that spaces in paths work.

Change-Id: Ie73a4b242ab0bf90e6f292be9a7b7913ae4273a5
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoNew class QTemporaryDir.
David Faure [Wed, 30 Nov 2011 17:00:12 +0000 (18:00 +0100)]
New class QTemporaryDir.

As discussed on qt5-feedback / development lists.

Change-Id: If1733369d12daa29054776ec2cbd78e63679768e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix tst_qsql crashes on Mac OS X
Honglei Zhang [Fri, 2 Dec 2011 13:48:29 +0000 (15:48 +0200)]
Fix tst_qsql crashes on Mac OS X

In tst_qsql, there are function calls to  QApplication(argc, 0, false), where
argc is zero. According to the documentation, argc must be greater than
zero and argv must contain at least one valid character string. The
misuse of this API has no problem on any platform other than Mac OS. This
commit has fixed the crash by passing valid dummy parameters.

Task-number: QTBUG-22811
Change-Id: I42b26d66f0becb7a942896e6ddcaea52ff720a48
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove QInternal callbacks and internal functions
Bradley T. Hughes [Tue, 29 Nov 2011 09:59:48 +0000 (10:59 +0100)]
Remove QInternal callbacks and internal functions

After commit 79f675a1e0f628bbc25345ebc1eb1f5809166c6b, the connect and
disconnect callback API effectively becomes useless. Now that these
callbacks cannot/do not, it makes little sense to keep the backdoors
added for Qt Jambi support.

Remove them for now. Should the Qt Jambi team want/need to port to Qt 5,
we can re-add them, possibly designing a better API for doing so as
well.

Change-Id: I6209a1d647d683c979d5294b632b8c12c0f9f91c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAutomatically add QtQuick module if only QtDeclarative is specified
Kent Hansen [Fri, 25 Nov 2011 11:13:16 +0000 (12:13 +0100)]
Automatically add QtQuick module if only QtDeclarative is specified

QtQuick and related APIs (QQuickItem, SceneGraph, et al), which
used to live in the QtDeclarative module, have moved to a new
module, QtQuick.

Existing projects that use QtQuick-specific APIs should add "quick"
to their project's QT variable, and update their include statements.

E.g.,

QT += declarative

should be changed to

QT += declarative quick

and

 #include <QtDeclarative/qquickitem.h>

should be changed to

 #include <QtQuick/qquickitem.h>

and similarly for the other QtQuick classes.

In order to give existing projects a chance to migrate smoothly, we
should issue a warning and automatically add the QtQuick module if
only the QtDeclarative module was specified. (If a project doesn't
use any QtQuick APIs, the warning can be ignored -- but there is no
way to disable it.)

This change, along with the compatibility headers in QtDeclarative,
make it possible to build existing projects without any modifications
on the project's side.

This change will be removed at a later time; when that happens,
existing projects that did not port to the QtQuick module will no
longer build.

Change-Id: I56abcadc1e5c74490527fc03646310d801bfc084
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoImplement QDir::removeRecursively
David Faure [Fri, 2 Dec 2011 09:39:19 +0000 (10:39 +0100)]
Implement QDir::removeRecursively

Task-number: QTBUG-4592
Change-Id: I363e2c24d1c0ada975b8b927d7c6e776b8aae579
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQSqlRelationalTableModel doesn't follow relations on the first column
Honglei Zhang [Thu, 1 Dec 2011 07:57:40 +0000 (09:57 +0200)]
QSqlRelationalTableModel doesn't follow relations on the first column

QSqlRelationalTableModel doesn't follow relations on the first column
of a table. The DisplayRole and the EditRole for indexes on column 0
are always the same. The bug is found in QSqlRelationalTableModel::data.

Task-number: QTBUG-20038
Change-Id: Ie1e98b5f46ffc171113f2d51b9b19ff5febb1c3c
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoAdded minimal class docs for QWindow to make it visible.
Gunnar Sletta [Fri, 2 Dec 2011 09:55:14 +0000 (10:55 +0100)]
Added minimal class docs for QWindow to make it visible.

Change-Id: Ibed2279ba5454547fb4060005e805a11221b3732
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake the Qt5 part of the target name namespace style.
Stephen Kelly [Thu, 1 Dec 2011 01:48:15 +0000 (02:48 +0100)]
Make the Qt5 part of the target name namespace style.

As it was in Qt4 and discussed on the cmake list.

Change-Id: Ide77c2525a261a5d658d7cb661010a67d3386341
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRemove cast and assignment operators from QAtomicInt and QAtomicPointer
Bradley T. Hughes [Thu, 29 Sep 2011 09:52:33 +0000 (11:52 +0200)]
Remove cast and assignment operators from QAtomicInt and QAtomicPointer

This is a source incompatible change. There is concern that the
convenience of the implicit cast and assignment operators can lead to
misuse. Several commits have already been done that remove excess use
of the implicit cast, which is a *volatile* read every time it's used.

Users of the QAtomic* API should have to think about when they are
loading the value, and if they do or don't need the acquire memory
barrier on load. The code that people would write using this API is
meant to be multi-threaded, concurrent, and correct. The API should not
allow them to inadvertently, possibly unknowingly, shoot themselves
in the foot.

SC-break-rubber-stamped-by: Lars Knoll
Change-Id: I88fbc26d9db7b5ec80a58ad6271ffa13bbfd191f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoCocoa: Handle accessible interface children.
Morten Johan Sorvig [Thu, 1 Dec 2011 08:39:25 +0000 (09:39 +0100)]
Cocoa: Handle accessible interface children.

Implement AccessIbleChildrenAttribute and
accessiblityHitTest.

Change-Id: Ia9fa80e3015edbb969d173a2587cb53b9c69852e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoDon't inherit QAccessible from QWindowsAccessible
Jan-Arve Saether [Fri, 2 Dec 2011 07:38:40 +0000 (08:38 +0100)]
Don't inherit QAccessible from QWindowsAccessible

Qualify all references to QAccessible members with QAccessible::

Change-Id: Ia78d8482bbab3d77c9e258a52bc74f8e7c0c7e10
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoWindows: Stabilize qpauseanimation test.
Friedemann Kleint [Thu, 1 Dec 2011 11:01:02 +0000 (12:01 +0100)]
Windows: Stabilize qpauseanimation test.

Change-Id: I93b470d89009d4573cbe3ec5018cddc40f4a4623
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUpdate documentation for QTest::qExec()
Jason McDonald [Fri, 2 Dec 2011 01:45:12 +0000 (11:45 +1000)]
Update documentation for QTest::qExec()

Update the documentation to make it clear that regular test applications
should not call QTest::qExec() more than once.  Also minor rewording of
description of return value.

Change-Id: I45bdf520ed10fd3c9232847a0ec0bc2b32d4caf3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoClean formatting.
Frederik Gladhorn [Thu, 1 Dec 2011 20:59:44 +0000 (21:59 +0100)]
Clean formatting.

Remove extra spaces, remove virtual keywords.
This code was simply inconsistent with the rest.

Change-Id: Iec8e9542dd4c458ddd535cb1766c90c18051686a
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoAccessibility: table2 -> table
Frederik Gladhorn [Thu, 1 Dec 2011 20:21:52 +0000 (21:21 +0100)]
Accessibility: table2 -> table

Rename the new interface after the old one has been removed.
This interface is very close to the IAccessible2 Table2 interface.

Change-Id: I8659232189fe0e8307151c743727de425c30ac9a
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agosyncqt: Create deprecated headers that work with MSVC
Kent Hansen [Wed, 30 Nov 2011 12:51:16 +0000 (13:51 +0100)]
syncqt: Create deprecated headers that work with MSVC

MSVC doesn't understand the #warning directive; use #pragma message
instead.

Change-Id: I42fe43269f5a84559a983932737c9eeb6b74b1ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRevert "Add QObject::objectNameChanged(const QString &objectName) signal"
Martin Jones [Fri, 2 Dec 2011 04:28:00 +0000 (14:28 +1000)]
Revert "Add QObject::objectNameChanged(const QString &objectName) signal"

This reverts commit ba635d7e74472f3a54c0c4686966af46d9035c6f.

Breaks tests in declarative:
tst_qdeclarativeecmascript::deleteLater
tst_qquickvisualdatamodel::objectListModel

Change-Id: I467b45109332e66fc62f3de00f376b1b88ab19ca
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agodirectfb: Introduce EGL integration for DirectFB
Holger Hans Peter Freyther [Sun, 27 Nov 2011 19:42:22 +0000 (20:42 +0100)]
directfb: Introduce EGL integration for DirectFB

Introduce a new platform called 'directfbegl' that allows platform
integration with EGL. Change the QDirectFbIntegration to make it more
easy to hook up in the creation process, introduce an EGL integration
with custom screen, window and EGL Platform Context.
Vendors might need to add custom code to initialize EGL to be used with
DirectFB, this can be done in QDirectFbScreenEGL::platformInit.

Change-Id: I7bee277ede27c72437cd7c5977fa6ed85e65f538
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE around the code
Holger Hans Peter Freyther [Sun, 27 Nov 2011 19:55:10 +0000 (20:55 +0100)]
directfb: Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE around the code

Change-Id: Iabf32130dcfe4f5a383e9c99f661ded176432817
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agodirectfb: Move the macro to the qdirectfbconvenience header file
Holger Hans Peter Freyther [Sun, 27 Nov 2011 10:51:45 +0000 (11:51 +0100)]
directfb: Move the macro to the qdirectfbconvenience header file

We will need to have logging outside of the blitter code, make the
macro available to everyone.

Change-Id: I811ecb98a870a818630276b5daa788790db71ccd
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoWindows: Fix qabstractfilenengine-test.
Friedemann Kleint [Thu, 1 Dec 2011 11:34:10 +0000 (12:34 +0100)]
Windows: Fix qabstractfilenengine-test.

The test fails if the repository is checked out with
Windows line endings. Try to work around.

Basically, ensure that common developers can conveniently
run the test.

Change-Id: I91f31b830ba7ba305deea782737d4e07a89420eb
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoRemove action enum.
Frederik Gladhorn [Thu, 1 Dec 2011 18:10:15 +0000 (19:10 +0100)]
Remove action enum.

This is a left over from the old way of
handling accessibility actions.

Change-Id: I1146f3dfec2b842f83a3cdd264e4ebb1013cc517
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoCompile.
Morten Johan Sorvig [Thu, 1 Dec 2011 18:50:15 +0000 (19:50 +0100)]
Compile.

QAccessible and QtQuick API changes.

Change-Id: I5e329543937f9dd4b68dd01321c475149df4678c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoMake cell a proper QAccessible2Interface.
Frederik Gladhorn [Tue, 29 Nov 2011 13:07:46 +0000 (14:07 +0100)]
Make cell a proper QAccessible2Interface.

Change-Id: I9b245037e8448f39ed2cb80d1ef5fb0714173518
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoRebuild configure.exe.
Friedemann Kleint [Wed, 30 Nov 2011 09:03:15 +0000 (10:03 +0100)]
Rebuild configure.exe.

- Build tests by default b8f6ad4d1f081780e9c108cd96007a924c596d14
- Added build system support for installing tests
  9ffd7a339f0da644c95e71583134263c06745ed5
- Add V8 snapshot support
  52ef2ee57fd75640aebdb7578aefb5303547dcc7
- Reduce size by using -O1
  76f2b0ab50df3fa7fb1e74662f08228ef1d54106

Change-Id: I3569a1e0550669154ca4da5eaff23d401556e4a6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agov8: Be able to build V8 for MIPS
Holger Hans Peter Freyther [Mon, 21 Nov 2011 20:37:48 +0000 (21:37 +0100)]
v8: Be able to build V8 for MIPS

Add mips to the list in configure and the v8.pri, build the existing
MIPS files. The result has not been verified to work.

Change-Id: I0f4fd29cd9752d32b6d87e0df0e888822f40ac0a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAdd QObject::objectNameChanged(const QString &objectName) signal
Bradley T. Hughes [Mon, 28 Nov 2011 12:05:33 +0000 (13:05 +0100)]
Add QObject::objectNameChanged(const QString &objectName) signal

This is sent when the object's name changes.

tst_moc must be updated since the method count of QObject has changed.
The test assumed that there were 4 invokable methods in QObject. The
new signal is the 5th, which breaks the test's assumptions. Fix this
as well.

tst_QObject must be updated since the
QObjectPrivate::isSignalConnected() method only supports the first 64
signals. With the addition of this new signal, sig61() in the test
becomes the 65th signal, and will always appear connected now.

Task-number: QTBUG-13999 (related)
Change-Id: Ie87893c71a231fafa7ccf2f16102238a7be8327a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoPass the tests when run in visual studio.
Stephen Kelly [Thu, 1 Dec 2011 13:15:20 +0000 (14:15 +0100)]
Pass the tests when run in visual studio.

Make sure the name of the project corresponds to the project name
passed to try_compile so that the .sln files are created.

Change-Id: Ifee24ac4ab6a16a538bdf7fb32ea252eb1ba436a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix QTcpServer::serverAddress() for dual stack sockets
Shane Kearns [Wed, 30 Nov 2011 17:21:51 +0000 (17:21 +0000)]
Fix QTcpServer::serverAddress() for dual stack sockets

When listening on QHostAddress::Any, serverAddress() should return
QHostAddress::Any too, assuming that setting the socket options
was successful.

Task-number: QTBUG-22899
Change-Id: I50a9ff1b4ad0c1c1905e2952c595d7068df2627d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoTests: Temporarily remove qsound.
Friedemann Kleint [Thu, 1 Dec 2011 14:09:09 +0000 (15:09 +0100)]
Tests: Temporarily remove qsound.

As the test does not link Windows.

Change-Id: I07ce2381146e43aef4353ddb2625ac472e6a0555
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoWindows: Fix compilation of qdir test.
Friedemann Kleint [Thu, 1 Dec 2011 13:44:33 +0000 (14:44 +0100)]
Windows: Fix compilation of qdir test.

Introduced by 3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef.

Change-Id: If47a9874cccb7b64840e77b1f654ba8e1cf372e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoImprove Q_CONSTRUCTOR_FUNCTION and Q_DESTRUCTOR_FUNCTION macros.
Jędrzej Nowacki [Mon, 28 Nov 2011 14:40:35 +0000 (15:40 +0100)]
Improve Q_CONSTRUCTOR_FUNCTION and Q_DESTRUCTOR_FUNCTION macros.

By adding anonymous namespace and static linkage we are reducing
visibility of implementation of these macros.

This patch also fixes warning about a declared but unused variable which
was issued by gcc 4.6 for Q_CONSTRUCTOR_FUNCTION.

Change-Id: I2cb70ad4c93f6f77e5518420abcce6fd4cadccfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoFix image format use in cocoa plugin
Gunnar Sletta [Thu, 1 Dec 2011 10:06:13 +0000 (11:06 +0100)]
Fix image format use in cocoa plugin

The screen should be opaque. It is used to create the
default pixmap data which should be RGB32 on mac.

The backing store uses premultiplied in the resize but
initializes with non premultiplied. Unify this to all
premultiplied

Change-Id: I7d17d492fcff30b555a768da852ff9be0a9d96aa
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd QRawFont from data support to Mac font db
Jiang Jiang [Wed, 30 Nov 2011 15:43:45 +0000 (16:43 +0100)]
Add QRawFont from data support to Mac font db

Change-Id: I02f1c4b35b9ed585e72aa4bad9b75d3c098f8e62
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoSet supporting writingSystem correctly
Jiang Jiang [Wed, 30 Nov 2011 15:41:11 +0000 (16:41 +0100)]
Set supporting writingSystem correctly

Change-Id: I963aa7b69a48441619c5885c443ae2620fcc4e57
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoPolish QWinEventNotifier.
Friedemann Kleint [Thu, 1 Dec 2011 08:24:38 +0000 (09:24 +0100)]
Polish QWinEventNotifier.

Fix docs, remove redundant Q_DISABLE_COPY.

Change-Id: I8398fb71bced5ac6f7eb8613cd2f8d10c325f056
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdded rotation animation to paintedwindow example.
Samuel Rødal [Wed, 23 Nov 2011 08:36:51 +0000 (09:36 +0100)]
Added rotation animation to paintedwindow example.

This serves as a useful test case for the QScreen orientation API.

Change-Id: I009ebd8b6d345453620420d84f3ff9d2d2e2663e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoopengl: Do not crash when programGuard is a nullptr
Holger Hans Peter Freyther [Sat, 19 Nov 2011 19:57:14 +0000 (20:57 +0100)]
opengl: Do not crash when programGuard is a nullptr

The rest of the code is checking programGuard for nullptr, do it here
as well to prevent a segmentation fault.

Change-Id: I38a03f74d493b8f731157be1739707b39904f7ba
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdded QPA window system interface handler for logical DPI changes.
Samuel Rødal [Tue, 22 Nov 2011 10:06:15 +0000 (11:06 +0100)]
Added QPA window system interface handler for logical DPI changes.

Logical DPI is independent from geometry and physical DPI.

Change-Id: Ice487f61e1bda9e6791e2adf6998ebf61cdbaef2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMark tst_qfilesystementry as private test on Windows.
Rohan McGovern [Thu, 1 Dec 2011 03:10:13 +0000 (13:10 +1000)]
Mark tst_qfilesystementry as private test on Windows.

On Windows (only), this test depends on some Q_AUTOTEST_EXPORT symbols.

Change-Id: I3b2ef8dcd56b8860f02fc28f45823b889e794909
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agotestlib: add QFINDTESTDATA macro for finding testdata files
Rohan McGovern [Tue, 29 Nov 2011 06:45:52 +0000 (16:45 +1000)]
testlib: add QFINDTESTDATA macro for finding testdata files

Automated tests often need to load some data from external files.
Currently, a wide variety of approaches for this have been used in Qt
autotests, including:

  - embed the source directory into the test binary at compile time, and
    find the testdata relative to that; this fails when the source tree
    is no longer available (e.g. when the tests are deployed to a device).

  - use a path relative to the current working directory, and trust that
    the caller always sets the current working directory such that the
    testdata can be found; this fails when the caller uses a different
    working directory than expected.

  - use a path relative to QCoreApplication::applicationDirPath();
    this fails when source tree != build tree (since testdata is not
    automatically copied into the build tree).

  - compile the files into the binary using the Qt resource system; this
    should work, but does not allow for testing of code which genuinely
    needs external files.

It seems that there is not a simple method for determining the testdata
path which can be reliably used in all circumstances, so various tests
have reinvented the testdata location method in different ways.
Therefore, this is a good candidate for an addition to the testlib API.

The current implementation of QFINDTESTDATA is able to find testdata
in all three of (build tree, install tree, source tree), in that order.

Change-Id: Ib2fed860723ccf437240da3b00db22dfe1a6b56c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFixed installation of corelib tests
Rohan McGovern [Thu, 24 Nov 2011 00:36:10 +0000 (10:36 +1000)]
Fixed installation of corelib tests

In .pro files, removed wince/symbian-specific DEPLOYMENT cases and
replaced them with TESTDATA where appropriate.

In .cpp files, removed SRCDIR and relative paths to testdata and
replaced them with the QFINDTESTDATA macro where appropriate.

Modified test helper apps/libs to install themselves under the test
they relate to.

This change allows corelib tests to be correctly installed, along with
their testdata, via `make install'.

Change-Id: I5e202e2f3b577af7e39072d5c9fe13e0ca125304
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoengineData should be cached solely based on QFontDef
Jiang Jiang [Wed, 30 Nov 2011 10:28:30 +0000 (11:28 +0100)]
engineData should be cached solely based on QFontDef

Each QFontPrivate points to a QFontEngineData instance, which is
essentially a mapping from different scripts to QFontEngines. Let's
say we have QFont("Waree") and trying to use that for one text in
Thai and another text in English, there should be only one
QFontEngineData: [ QUnicodeTables::Common -> QFontEngineMulti(1),
QUnicodeTables::Thai -> QFontEngineMulti(2) ]. If we cache
QFontEngineData using QFontCache::Key (which includes QFontDef,
script and screen) as the key, then we will create two
QFontEngineData: [ QUnicodeTables::Common -> QFontEngineMulti(1) ]
and [ QUnicodeTables::Thai -> QFontEngineMulti(2) ], so it will be
pointless to have QFontEngineData at all.

This bug was introduced in a 2005 refactoring (512f0e8c in history
repo).

Change-Id: I14677507e97682472cde9a0e1b594e903ec9e718
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix compilation of Benchmark tests on Windows.
Friedemann Kleint [Tue, 29 Nov 2011 11:49:24 +0000 (12:49 +0100)]
Fix compilation of Benchmark tests on Windows.

Change-Id: I92186f916792d110f22b23525b673ef006e19046
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoImprove QString autotest.
Jason McDonald [Thu, 1 Dec 2011 03:02:54 +0000 (13:02 +1000)]
Improve QString autotest.

The QString autotest shares test data between the remove() and replace()
tests because those functions are very similar.  Unfortunately, when an
integer overflow bug was found in remove() the regression test was not
shared with replace(), which prevented the same integer overflow bug
from being discovered in replace().

This commit improves the test by sharing the overflow test data between
both functions, thus demonstrating the remaining bug.

Task-number: QTBUG-22967
Change-Id: I2778249800f74799d890eefa9227ca8ddd8fbaa3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMinor improvement to QByteArray autotest
Jason McDonald [Tue, 29 Nov 2011 07:14:54 +0000 (17:14 +1000)]
Minor improvement to QByteArray autotest

Rename the qUncompress test to make clear that the test only deals with
uncompressing corrupted data and add a message making it clear that this
test will produce some warning messages.

Don't skip creating the test data, as that prevents the test output
reporting exactly what is skipped.

The expected output is the same for every row (an empty QByteArray), so
don't bother storing that in the data table.

Change-Id: I59f1cc91a941bcaadacb2a613dd5eca2564961c1
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake QWinEventNotifier part of the public API
Debao Zhang [Sun, 27 Nov 2011 17:00:38 +0000 (01:00 +0800)]
Make QWinEventNotifier part of the public API

QWinEventNotifier is an essential class if you're using native Windows
Overlapped IO and need to convert it to Qt signals. However the header
is marked private.

Task-number: QTBUG-68

Change-Id: I22e9a84da97f969ddb82e9ba15e604a01abd80d0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoMerge QObject::tr*() and QCoreApplication::translate() overloads
Bradley T. Hughes [Mon, 28 Nov 2011 14:24:25 +0000 (15:24 +0100)]
Merge QObject::tr*() and QCoreApplication::translate() overloads

These were marked as TODO items for Qt 5. Do them now. (The TODO item
was added when plural support was added back in the early Qt 4 days.)

Change-Id: I3be50bc657582db730401103d691234695784340
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix QHostAddress::operator==(QHostAddress::SpecialAddress)
Shane Kearns [Wed, 30 Nov 2011 15:42:05 +0000 (15:42 +0000)]
Fix QHostAddress::operator==(QHostAddress::SpecialAddress)

QHostAddress(QHostAddress::Any) was not equal to QHostAddress::Any
because only one of the operator== overloads was handling this.

Task-number: QTBUG-22898
Change-Id: Ifd36947a50e8c36362b4e850fd8d5105ee0925ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMade more QScreen properties NOTIFY and added average DPI properties.
Samuel Rødal [Tue, 22 Nov 2011 09:34:47 +0000 (10:34 +0100)]
Made more QScreen properties NOTIFY and added average DPI properties.

The physicalDotsPerInch() is the average of the horizontal and vertical
physical dots per inch, and likewise logicalDotsPerInch() is the average
of the horizontal and vertical logical dots per inch.

Change-Id: I18aa610dc9a63efe062f78c823ba29f90b2712f4
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoSupport for up to 6 arguments in the new connection syntax
Olivier Goffart [Tue, 8 Nov 2011 17:34:47 +0000 (18:34 +0100)]
Support for up to 6 arguments in the new connection syntax

For compilations without variadic template support

Change-Id: I78af4f6022ad7a0923e5c5788a34eb7d834f50f3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoDocument the new connection syntax
Olivier Goffart [Thu, 10 Nov 2011 11:17:53 +0000 (12:17 +0100)]
Document the new connection syntax

It is already documented in the QObject API documentation, but
Also update the overview

Change-Id: I92f44a50222738530928e3f4e6e463b3210d3a29
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoMac Core Text font database for QPA
Jiang Jiang [Tue, 15 Nov 2011 12:59:36 +0000 (13:59 +0100)]
Mac Core Text font database for QPA

Add Core Text fontdatabase for Mac and use it as default. It also
reenabled Core Text font engine for native font rendering on Mac,
though it's not used in declarative UI (by default declarative
will still use scenegraph, which will only use this font engine
for retrieving font metrics and outlines).

With the new fontdatabase it's now possible to load all the fonts
installed in the system as well as adding application fonts.

Change-Id: I0d2aa1420019adf6d0f70dd147a9d71b2684d3f1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix sqlite driver memory eating due to close failure
Honglei Zhang [Tue, 29 Nov 2011 11:00:16 +0000 (13:00 +0200)]
Fix sqlite driver memory eating due to close failure

If an ongoing query is not finalized before close function is
called, sqlite driver still tries to close the connection to
sqlite. In this case, sqlite reports an error to sqlite driver
which is not reported to the client. The failure in close causes
connection to sqlite unclosed and memory is not freed. This
fix tries to finalize all queries before close function is called.
The close function should succeed.

Task-number: QTBUG-16967
Change-Id: I2f10a2a9017446a9d44b693b00464a89625e3602
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoInclude qglobal.h first in qnsview.mm compilation unit.
Zeno Albisser [Tue, 29 Nov 2011 17:30:34 +0000 (18:30 +0100)]
Include qglobal.h first in qnsview.mm compilation unit.

If cocoa headers are being included first, this messes up
the defines MAC_OS_X_VERSION_MAX_ALLOWED and MAC_OS_X_VERSION_MIN_REQUIRED
when compiling with clang.

Change-Id: I07177d07a0ac7c5f7e72b04f42d6343e689e0d33
Reviewed-by: Ali Akhtarzada <ali.akhtarzada@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
12 years agoFix casting. Casting is now done through the virtual interface_cast.
Jan-Arve Saether [Wed, 30 Nov 2011 08:48:51 +0000 (09:48 +0100)]
Fix casting. Casting is now done through the virtual interface_cast.

Change interface_cast to return void* to avoid using virtual
inheritance.
Get rid of the magic Q_ACCESSIBLE_OBJECT macro.

Change-Id: I94b824aef53f2ba657d39d406b387c8681d47ee4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agomkspec win32-msvc2003 moved to unsupported
Joerg Bornemann [Thu, 24 Nov 2011 09:59:42 +0000 (10:59 +0100)]
mkspec win32-msvc2003 moved to unsupported

Change-Id: Idabdd08a033f3e77dae2de21b6544f57893abd59
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMoved integrationtests/* into other/
Jo Asplin [Fri, 25 Nov 2011 08:30:03 +0000 (09:30 +0100)]
Moved integrationtests/* into other/

Currently there seems to be no precise definition of what
an integrationtest is in the context of Qt testing.

To avoid confusion, the tests under integrationtests/ are
moved into other/ (which is effectively where we keep
tests that don't clearly fit into any other category).

Tests can be moved back into an integrationtests/ directory
at a later point, should an unambiguous definition be established.

Change-Id: I3bb289be2dc2aca11b51a8ce8fcc5942f06d6c5c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoCleanup corelib autotests
Jason McDonald [Tue, 29 Nov 2011 06:37:01 +0000 (16:37 +1000)]
Cleanup corelib autotests

Remove references to the old bug tracker.  The data from the old bug
tracker is no longer accessible, so these markers are meaningless.

Change-Id: Ib9d029d52b70fd0a512b9532d65f03763eabfe57
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoBenchmark the new signal slot connection syntax.
Olivier Goffart [Fri, 25 Nov 2011 18:00:01 +0000 (19:00 +0100)]
Benchmark the new signal slot connection syntax.

 - Added emition of a slot connected using the new syntax, as well as a
   functor

 - Replaced the old connect_disconnect_benchmark by a new one. The old
   one was of little interest as it tried to connect to every signal,
   producing a lot of similar results.
   The new test tests different ways of connecting and disconnecting

Change-Id: I3c04c24027252308f8942bcd9562110104cdb4e9
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix Qt::QueuedConnection when signal has a return value
Olivier Goffart [Tue, 29 Nov 2011 00:44:18 +0000 (01:44 +0100)]
Fix Qt::QueuedConnection when signal has a return value

For queued connections, the args[0] is set to null as it make no sens to
forward the return value to the signal.
So we need to check in the operator, that the pointer is not null.
(container.data is args[0])

Change-Id: I80bde66f1ec19de0f4962c80e5b2797d2819075c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix a deadlock in QMetaType.
Jędrzej Nowacki [Tue, 29 Nov 2011 09:07:38 +0000 (10:07 +0100)]
Fix a deadlock in QMetaType.

QMetaType should unlock all mutexes guarding custom types data before
calling an user code.

Task-number: QTBUG-22930
Change-Id: I501d011d6cbd467d8f22402d668e84aa848061b8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQByteArray: Fix MSVC warning.
Friedemann Kleint [Tue, 29 Nov 2011 10:58:57 +0000 (11:58 +0100)]
QByteArray: Fix MSVC warning.

Warning C4308: negative integral constant converted
to unsigned type.

Change-Id: Ibdb14ad2ceebd56715fda861151e92f6dc10f955
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAccessible debug stream: don't print details for invalid objects
Frederik Gladhorn [Tue, 29 Nov 2011 12:25:37 +0000 (13:25 +0100)]
Accessible debug stream: don't print details for invalid objects

Print "invalid" instead of the details.

Change-Id: I785a896b680fad9e9bb81769d9e3361542fbaafe
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoSupport Qt::UniqueConnection in the new connection syntax
Olivier Goffart [Fri, 25 Nov 2011 21:35:32 +0000 (22:35 +0100)]
Support Qt::UniqueConnection in the new connection syntax

This commit also improves the related documentation a bit.

The test is copied from the test with the old syntax, but all the
connection statement are changed to use the new syntax

Change-Id: Ia5630ca4335b9f8ca6d724ae3c8750d6f0804d8e
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoReduce code dupplication in QObject::connect
Olivier Goffart [Tue, 29 Nov 2011 06:21:10 +0000 (07:21 +0100)]
Reduce code dupplication in QObject::connect

Move from each implementation of QObject::connect to
QObjectPrivate::addConnection the code that adds the
QObjectPrivate::Connection* to the sender's list.

Change-Id: I665af016d5e6673eb0e9c06965e5deed50454b28
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>