profile/ivi/qtbase.git
12 years agoRemoved obsolete function QUuid::operator QString()
Denis Dzyubenko [Mon, 2 Jan 2012 15:47:59 +0000 (16:47 +0100)]
Removed obsolete function QUuid::operator QString()

It is a source incompatible change, but I believe it is safe to say that it is
a small change, which doesn't affect many people.

Change-Id: Iad11befe4cca60484cf4e04cd3049c93a4ea5faf
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove old accessible itemviews code.
Frederik Gladhorn [Thu, 1 Dec 2011 18:49:35 +0000 (19:49 +0100)]
Remove old accessible itemviews code.

We are moving to use IAccessible2.
This code is dead.

Change-Id: Ib1687faeafbec84cfa3b123d6f6398998033d342
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoSplit polling watcher out to its own seperate files.
Robin Burchell [Wed, 4 Jan 2012 20:44:35 +0000 (21:44 +0100)]
Split polling watcher out to its own seperate files.

Just helps maintain sanity and clarity a bit.

Change-Id: Iaf00f9ecf2d959afcd8fe18bbca71a403cf9818d
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix QPainter::drawText with complex brushes
Simon Hausmann [Wed, 4 Jan 2012 15:32:55 +0000 (16:32 +0100)]
Fix QPainter::drawText with complex brushes

Commit d52fd497f60a3c4456994f4f10e9451d611c9ea4 introduced a call path to
QPaintEngineEx::drawStaticTextItem, which has a bug in using the pen's color
instead of the entire brush.

This patch replaces the use of the color with the pen's brush().

Task-number: QTBUG-23450
Change-Id: Ieb3bf352c840ff0d3fb4ac678caf7b13f4f9a8f1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoPass notification of failure of watches onto the caller.
Robin Burchell [Tue, 27 Dec 2011 21:30:05 +0000 (22:30 +0100)]
Pass notification of failure of watches onto the caller.

This is particularly useful for situations where the user might really want to
be notified about a failure, for instance, in a backup application.

Empty paths are not treated as an error in calling, as the user code cannot
really do anything sensible to handle this error, but empty paths should not be
used.

Change-Id: Iddb44fd39f4e3fac5c3f9f60fb7999e1833280a8
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoEmit error if trying to connect while socket is connected or connecting.
Jonas M. Gastal [Tue, 27 Dec 2011 20:00:18 +0000 (18:00 -0200)]
Emit error if trying to connect while socket is connected or connecting.

This applies to both local and abstract sockets.

Task-number: QTBUG-22450
Change-Id: I5c58d68da95ffb6bcde5be510853359b288e5984
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoDon't release timer ids in event dispatcher code
Bradley T. Hughes [Tue, 20 Dec 2011 10:38:35 +0000 (11:38 +0100)]
Don't release timer ids in event dispatcher code

3rdparty event dispatchers are impossible to write without using the
internal API QAbstractEventDispatcherPrivate::releaseTimerId(). Fix
this by having each QObject keep track of its own timer ids, and
release them when they are no longer used. As a side effect, this
makes the QObjectData::pendTimer bit unnecessary.

This also removes the QObjectData::inThreadChangeEvent hack that the
event dispatchers used to avoid releasing timer ids when moving timers
to a new thread.

QBasicTimer becomes even more low-level. It cannot use
QObject::startTimer() anymore, since we do not have a way to call
QObject::killTimer() from QBasicTimer::stop(). QBasicTimer uses the
QAbstractEventDispatcher interface directly, and releases the timer id
explicitly as well when stopping the timer.

This change also fixes some rare timer id "leaks" when destroying or
stopping timers after a thread has exited and destroyed its event
dispatcher (the timer ids would never be released when no dispatcher
exists).

Globally destructed QObjects that have running timers may try to release
their timer ids after the timer id freelist has been destroyed. This
commit accomodates such objects by avoiding the null dereference in
QAbstractEventDispatcherPrivate::releaseTimerId().

Change-Id: I2d7cd8221fae441f3cf02b6c0b4bc16063834d00
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoFix rare crashes in fontconfig fontdb due to uninitialized variable
Simon Hausmann [Wed, 4 Jan 2012 12:04:58 +0000 (13:04 +0100)]
Fix rare crashes in fontconfig fontdb due to uninitialized variable

Initialize the out variable passed to FcPatternGetString to protect
against the "failure" case. Otherwise the subsequent QString::fromUtf8
is called with an uninitialized pointer.

Change-Id: I31b8b4c366f673609b26eca162334fd8bc9f25d2
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoRefactor QVariant handlers.
Jędrzej Nowacki [Tue, 29 Nov 2011 14:42:33 +0000 (15:42 +0100)]
Refactor QVariant handlers.

QVariant implementation is based on delegation to a handler. The handler
has rather simple construction, it is a set of function that implements
a switch statement over known types and redirects calls to a right
method of an encapsulated types instance. Unfortunately after qt
modularization project, it is not easy to use types directly from
different modules, as they can be undefined or completely unaccessible.
Which means that each module has to implement own handler to cooperate
correctly with QVariant. We can suspect that list of modules known to
QVariant will grow and it is not limited to GUI, Widgets and Core,
therefore it would be nice to have an unified, from performance and
source code point of view, way of working with handlers.

This patch is an attempt to cleanup handlers. Keynotes:
- Each handler is working only on types defined in the same module
- Core handler implements handling of primitive types too
- Custom types have an own handler
- Each handler is independent which means that dispatch between handlers
  is done on QVariant level
- Handlers might be registered / unregistered using same interface

Change-Id: Ib096df65e2c4ce464bc7a684aade5af7d1264c24
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoconfigure: Remove -nokia-developer option
Kai Koehne [Tue, 3 Jan 2012 15:01:40 +0000 (16:01 +0100)]
configure: Remove -nokia-developer option

There's no good reason to still differentiate between 'Nokia' developers,
and Qt developers outside of Nokia, inside configure. Just use
-developer-build -opensource -confirm-license.

Change-Id: I8726947dae0c70412eb52bf9d88eda4aa061ef26
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoExport QOpenGLTextureCache
Jørgen [Mon, 2 Jan 2012 09:20:14 +0000 (10:20 +0100)]
Export QOpenGLTextureCache

because it can be useful outside QtGui. The function
QOpenGLTextureCache::bindTexture gives a very convenient way to get a
texture from an image.

Change-Id: I2e22c0a3a8f1f307d0b558280043f726e3d8093a
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agofix invalid connection in tst_QProcess::lockupsInStartDetached
Joerg Bornemann [Mon, 2 Jan 2012 10:43:48 +0000 (11:43 +0100)]
fix invalid connection in tst_QProcess::lockupsInStartDetached

Change-Id: I06f2d56f5c45c13bbe08707e6baad4f2aece39b8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoDeinlined QLocale::operator==
Denis Dzyubenko [Mon, 2 Jan 2012 21:34:50 +0000 (22:34 +0100)]
Deinlined QLocale::operator==

Some time ago this was a blocker that didn't allow to refactor QLocale
implementation due without making binary incompatible changes. Deinlining those
functions for Qt5, it shouldn't be performance critical code path.

Change-Id: I6cb19e32188a2df223d04be0c613a6176ad8d118
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMarked QUuid as Q_MOVABLE_TYPE in the metatype system.
Denis Dzyubenko [Mon, 2 Jan 2012 16:16:04 +0000 (17:16 +0100)]
Marked QUuid as Q_MOVABLE_TYPE in the metatype system.

Change-Id: I3d343b71294ad5640636694d1a079ea9dcca6348
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
12 years agoAvoid QCOMPARE outside test function in QSettings test.
Jason McDonald [Tue, 3 Jan 2012 05:16:14 +0000 (15:16 +1000)]
Avoid QCOMPARE outside test function in QSettings test.

QCOMPARE and friends should only be called in a test function.  Instead
of calling QCOMPARE elsewhere, keep a count of the number of errors and
QCOMPARE that count with zero in the test function.

Change-Id: I9a264e91169a98c30980fdc04a3e45bfb0ca8063
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove redundant debug code from QFileSystemWatcher test.
Jason McDonald [Tue, 3 Jan 2012 04:33:44 +0000 (14:33 +1000)]
Remove redundant debug code from QFileSystemWatcher test.

There is no need to print out the name of the backend used by each test
run of a test function as every message output by the test function will
have the name of the current data row included.

Change-Id: Ie69881d2ecedce728ea67b5aae1c1196776552a5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoAdd virtual destructors to accessible interfaces.
Frederik Gladhorn [Tue, 3 Jan 2012 16:50:02 +0000 (17:50 +0100)]
Add virtual destructors to accessible interfaces.

Change-Id: I60a6033911757f86c70f06c2d8d4240d2332b4cf
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
12 years agoAccessibility: extend listview unit test.
Frederik Gladhorn [Thu, 8 Dec 2011 13:10:46 +0000 (14:10 +0100)]
Accessibility: extend listview unit test.

Test more functions from Table Cell.

Change-Id: I43b8766138350ece781bdaba7ab10fde8542aa4f
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoFixed static assert in qvariant template magic
Denis Dzyubenko [Tue, 3 Jan 2012 16:05:49 +0000 (17:05 +0100)]
Fixed static assert in qvariant template magic

CallConstructor<T, /* CanUseInternalSpace = */ false> is called when we need to
construct an object that couldn't be fit in qvariantdata, meaning either it is
not a POD type (Q_PRIMITIVE_TYPE), or it is simply too large to fit there.

Change-Id: Ied122b4a6f600e14312a8d515f5b3e91214a94f1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoMake QCocoaEventDispatcher inherit from QAbstractEventDispatcher
Bradley T. Hughes [Mon, 2 Jan 2012 08:23:49 +0000 (09:23 +0100)]
Make QCocoaEventDispatcher inherit from QAbstractEventDispatcher

... instead of QEventDispatcherUNIX. The Cocoa dispatcher does not use
any of the facilities of the UNIX dispatcher, and it reimplements every
virtual method already (with the exception of flush(), which just needs
an empty implementation).

Change-Id: I24aefd169888946afac7800192a0f96770787718
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoUse meta object to get string rep of QAccessible::Role.
Frederik Gladhorn [Fri, 9 Dec 2011 10:06:28 +0000 (11:06 +0100)]
Use meta object to get string rep of QAccessible::Role.

Change-Id: I69320b69ea13ebc594575277e39d30a066df61fd
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoAlways load the openssl configuration.
Richard Moore [Tue, 27 Dec 2011 16:09:59 +0000 (16:09 +0000)]
Always load the openssl configuration.

This change makes Qt load the default openssl config always, not just
when compiled with OPENSSL_LOAD_CONF. This means that facilities like
openssl engines (and their configuration) are usable. An alternative
would be to call OPENSSL_config(NULL) ourselves, but that's exactly
what the OPENSSL_add_all_algorithms_conf does for us.

Task-number: QTBUG-16018
Change-Id: I4cda701f82627e0541b6225009f4e1249aec9d47
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQStandardPaths: add GenericCacheLocation.
David Faure [Mon, 2 Jan 2012 22:36:05 +0000 (23:36 +0100)]
QStandardPaths: add GenericCacheLocation.

Much like DataLocation = GenericDataLocation + domain + appname,
this makes CacheLocation = GenericCacheLocation + domain + appname.
This way a framework library can have an application-independent cache
(like ksycoca).

Change-Id: I6a8c47ff85b7d5c68b594cc8b071a752d96b029d
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQLineEdit to use Qt::ImhSensitiveData input hint on password echo modes
Pekka Vuorela [Mon, 2 Jan 2012 14:34:19 +0000 (16:34 +0200)]
QLineEdit to use Qt::ImhSensitiveData input hint on password echo modes

Change-Id: I6922e41e7e57563f1190f46e0890b71e5c4b7ef4
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoMake sure tst_QThreadStorage finds its subprocess
Bradley T. Hughes [Mon, 2 Jan 2012 11:38:45 +0000 (12:38 +0100)]
Make sure tst_QThreadStorage finds its subprocess

On Mac, the application's dir is in the bundle, so we need to "escape"
the bundle when looking for the an executable relative to the
application's dir path.

Change-Id: I5c01f7d816ec8cc30f5277202f4eefb0c49a2bc3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agodirectfb: Refer to the right class in the error message
Holger Hans Peter Freyther [Mon, 2 Jan 2012 16:14:38 +0000 (17:14 +0100)]
directfb: Refer to the right class in the error message

Change-Id: I41d0b95092d16bc3a643fca903c68be82813dad6
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoBuild fix if using '-no-stl' configure option
Yuchen Deng [Fri, 30 Dec 2011 13:02:17 +0000 (21:02 +0800)]
Build fix if using '-no-stl' configure option

MSVC2010SP1:
error C3861: 'wmemcpy': identifier not found

Change-Id: Ib28edb5e38d691635c56dac846134e1c88c3f312
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUse true and false in preference to TRUE and FALSE in tests.
Jason McDonald [Fri, 30 Dec 2011 05:51:05 +0000 (15:51 +1000)]
Use true and false in preference to TRUE and FALSE in tests.

Use the C++ boolean constants true and false instead of the C macros
TRUE and FALSE (which are actually integers), and use QVERIFY instead of
QCOMPARE for verifying simple boolean expressions.

Change-Id: Ie76dfcab6722df6b93b3fa62b0f3437901482932
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoClose bracket in documentation.
Stephen Kelly [Mon, 2 Jan 2012 14:14:48 +0000 (15:14 +0100)]
Close bracket in documentation.

Change-Id: Iabc7c6a9f5554450e766dc63f518595871a3abb7
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoRemove support for dnotify QFileSystemWatcher.
Robin Burchell [Tue, 27 Dec 2011 17:24:57 +0000 (18:24 +0100)]
Remove support for dnotify QFileSystemWatcher.

Inotify has been available in Linux for some ~6 years now, 7 when Qt 5 will
actually be released, so I'd say it's safe to remove this fallback path now,
particularly as the autotest notes that it's broken.

Change-Id: I49dbb161d4765d63e92f512a6375323c7d37ccbe
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoMerge integrity support into unix.
Robin Burchell [Tue, 27 Dec 2011 17:28:21 +0000 (18:28 +0100)]
Merge integrity support into unix.

Similarly to ec9ea7f3e819cb0c2da8c8977f9cc44688c9b6f6, the code in unix
(non-Linux/OS X) is actually the same as for integrity, so merge the
conditionals together to save duplication.

This should have the side-effect of unbreaking Qt 5 on integrity wrt
the new QStandardPaths introduction, which was not added to the integrity
block.

Change-Id: Ib512fa781f5ceb240069888ce6958c9af2990d37
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoFix crash in positionInLigature
Jiang Jiang [Fri, 16 Dec 2011 13:21:49 +0000 (14:21 +0100)]
Fix crash in positionInLigature

Check boundary of pos before accessing attributes.

Task-number: QTBUG-23104
Change-Id: I0bc93dbe320badc65acc75bb59b27f481e69b93e
Reviewed-by: Eskil
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoChange the default value of QSortFilterProxyModel::dynamicSortFilter
Stephen Kelly [Tue, 20 Dec 2011 11:56:01 +0000 (12:56 +0100)]
Change the default value of QSortFilterProxyModel::dynamicSortFilter

The value is changed to true. It is a common bug that developers expect
this proxy model to reflect the source model when the source changes.
That requires setDynamicSortFilter(true), so we change the default to
optimize for the common case.

Change-Id: I9bf7efdbda10309fa77aed9391c33054aaae4a29
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoSend ApplicationActivate and ApplicationDeactivate from QtGui.
Samuel Rødal [Fri, 9 Dec 2011 16:29:25 +0000 (17:29 +0100)]
Send ApplicationActivate and ApplicationDeactivate from QtGui.

Instead of only from QApplication in QtWidgets, as we need these events
for example in QDeclarativeApplication.

Task-number: QTBUG-21573
Task-number: QTBUG-23331
Change-Id: I0c960bd1c7911d306d274a6e9a1838f158235ed0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
12 years agocorelib: Introduce Q_ALLOC_SIZE and use it on qMalloc and friends
Holger Hans Peter Freyther [Mon, 2 Jan 2012 12:31:46 +0000 (13:31 +0100)]
corelib: Introduce Q_ALLOC_SIZE and use it on qMalloc and friends

GCC 4.3 introduced the alloc_size attribute to hint the compiler
that allocated memory will be returned, inform the compiler which
parameter holds the size of the allocation.

Change-Id: I8734868f6bd19e201abdacd0a1b0fb80a27883c0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoImplement (and unit test) simple QVarLengthArray::first()/last().
Robin Burchell [Wed, 14 Dec 2011 16:49:35 +0000 (17:49 +0100)]
Implement (and unit test) simple QVarLengthArray::first()/last().

Pure syntactical sugar, to match up with what the other container
classes offer.

Change-Id: I0f97de011923d9d204cca0fa906b059dc5054a89
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove Symbian support from src/corelib/io/.
Robin Burchell [Tue, 27 Dec 2011 17:11:08 +0000 (18:11 +0100)]
Remove Symbian support from src/corelib/io/.

Change-Id: I52c2a58396e03f29ca478de34c914535c7ae1012
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoDo not unconditionally define QT_BEGIN_MOC_NAMESPACE
Denis Dzyubenko [Fri, 30 Dec 2011 13:18:28 +0000 (14:18 +0100)]
Do not unconditionally define QT_BEGIN_MOC_NAMESPACE

Qt5 modules are supposed to be in a namespace, but if the namespace definition
is hidden in a macro, then moc doesn't know about it and generates invalid
moc_xx.cpp that cannot be compiled due to usage of classes outside of their
namespaces - e.g. in qtjsondb we have QtAddOn::JsonDb::Foo class, but the
moc_foo.cpp expects to find that class in the global namespace instead.

Fixed it in QtJsonDb to define QT_BEGIN_MOC_NAMESPACE="QT_USE_NAMESPACE
QT_ADDON_JSONDB_USE_NAMESPACE", however we need to ensure qglobal.h doesn't
re-define that macro back.

Change-Id: Ic8407f50c11d2d787167ad2f92457aa3ec126d45
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoInline some methods in qgrayraster.
Robin Burchell [Sat, 17 Dec 2011 22:33:51 +0000 (23:33 +0100)]
Inline some methods in qgrayraster.

gray_conic_to, gray_cubic_to and gray_line_to were all single line wrappers
around their equivilent gray_render counterparts, with an additional lie of
error handling that never actually happened.

Since this doesn't really do anything except confuse the reader, let's ... not
do it :)

Change-Id: Id5d86c49174acb92514b628a70bd32d6c6640a5d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove env var to enable accessibility on linux.
Frederik Gladhorn [Fri, 30 Dec 2011 11:45:52 +0000 (12:45 +0100)]
Remove env var to enable accessibility on linux.

Usually we don't have a plugin for this on linux anyway.
But if we do, we should actually allow it to interface with the
system.
When using AT-SPI the plugin can detect if it should be active.
Other plugins can fall back to using an env var if really needed.

Change-Id: Ic9dcfa305e7cdafbf4a93bcc2dc9a0fcd9b9a7a2
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoblitter: Base QBlitterPaintEngine on QRasterPaintEngine
Holger Hans Peter Freyther [Sun, 1 Jan 2012 21:12:34 +0000 (22:12 +0100)]
blitter: Base QBlitterPaintEngine on QRasterPaintEngine

The original intention was to identify a clipping bug, it turns out
that during a ::begin() (and systemChanged) we should forward the
QPaintEnginePrivate state to our proxy engine.
Instead of using the proxy-pattern subclass rasterengine and
specialize the paths we are able to accelerate using the blitter
interface. This will avoid similiar problems in the future. I have
no performance measurement to show which of the two approaches is
faster/slower.

Change-Id: I39bff11b32b1fe20284c7e8df60050de5991bb6e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Group code by functionality in header and cpp file
Holger Hans Peter Freyther [Sun, 1 Jan 2012 20:26:56 +0000 (21:26 +0100)]
blitter: Group code by functionality in header and cpp file

* Group code responsible for tracking the render pipeline state
  to check if we can easily accelerate it
* Code that will call into the QBlittable
* Code that will lock the QBlittable before calling into raster

Change-Id: I862e242d59805de5094ed363b486afcdbc23ff78
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Fix the 'solid' detection for the brush in case of fillRect
Holger Hans Peter Freyther [Sun, 1 Jan 2012 14:49:44 +0000 (15:49 +0100)]
blitter: Fix the 'solid' detection for the brush in case of fillRect

A default QPainter will set a QBrush with Qt::NoBrush BrushStyle, the
current code detects this as a non solid fill and all calls with fillRect
and a color will not go through QBlittable. Check for Solid or NoBrush
style. Manually verified that a p.fillRect(rect, Qt::red) goes through
the accelerated path now.

Change-Id: Ic0d98030e94f5d11abbe61628fbf71d1e08219c2
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Move state updates into new methods
Holger Hans Peter Freyther [Sun, 1 Jan 2012 19:56:38 +0000 (20:56 +0100)]
blitter: Move state updates into new methods

Create updateCompleteState(QPainterState*) so we don't need to
call into the paintengine, move all state methods into the
QBlitterPaintEnginePrivate class.

Change-Id: If30fdcc3f63755e0443bced7d9d9fb993d4ec2b7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Move the definition out of the class
Holger Hans Peter Freyther [Sun, 1 Jan 2012 19:08:47 +0000 (20:08 +0100)]
blitter: Move the definition out of the class

Cosmetic change to remove four spaces of indention from some of the
deeply nested methods.

Change-Id: I67fdd0ab722b7c7c67c4da7a0a0bd86459751700
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Kill the isBlitterLocked variable of the QBlitterPaintEngine
Holger Hans Peter Freyther [Sun, 1 Jan 2012 18:58:20 +0000 (19:58 +0100)]
blitter: Kill the isBlitterLocked variable of the QBlitterPaintEngine

It starts with being initialized wrongly, the call to buffer() will
lock the data while we think it is not locked, it can also get out of
sync by someone calling buffer() again. Remove the variable and
check with the QBlittable if we need to lock the resource into memory.

Change-Id: I350375011138d1b4c2c48c100b7b30b8ea2ae460
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Use CapabilitiesToStateMask as a class member
Holger Hans Peter Freyther [Sun, 1 Jan 2012 18:50:16 +0000 (19:50 +0100)]
blitter: Use CapabilitiesToStateMask as a class member

Move the bit helper functions into CapabilitiesToStateMask as they
are only used in this class, allocate the class as part of the
QBlitterPaintEnginePrivate, shorten the name as well.

Change-Id: If22ddd117a9789cd98edb08f23fd0ffabb17d5a5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoblitter: Style changes to the code
Holger Hans Peter Freyther [Sun, 1 Jan 2012 18:43:30 +0000 (19:43 +0100)]
blitter: Style changes to the code

Spend some bytes for spaces after comma and keywords. This should
now mostly follow the Qt style guidelines.

Change-Id: I3298c8d41d40ab5b0153a33d44b1b607a2edca8e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoraster: Fix typo in a function argument
Holger Hans Peter Freyther [Sun, 1 Jan 2012 12:34:03 +0000 (13:34 +0100)]
raster: Fix typo in a function argument

Change-Id: I903e1245667680f43414414bb0b4bfaa6240ea04
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMake QTimer::singleShot use Qt::PreciseTimer for lower timeouts.
Bradley T. Hughes [Wed, 21 Dec 2011 10:33:07 +0000 (11:33 +0100)]
Make QTimer::singleShot use Qt::PreciseTimer for lower timeouts.

CoarseTimers are worst in their first firing, so we prefer a
PreciseTimer for something that happens only once. If the timeout is
too big, we use a CoarseTimer anyway (current threshold is 2000ms).

Author: Thiago Macieira <thiago.macieira@nokia.com>
Change-Id: I30b20acf506e442cd58126abfe3a4d70fc13b075
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoChange QTimerInfo (UNIX) to keep the interval in milliseconds.
Bradley T. Hughes [Wed, 21 Dec 2011 10:33:56 +0000 (11:33 +0100)]
Change QTimerInfo (UNIX) to keep the interval in milliseconds.

The API passes the interval as an int, there's no reason to convert
it to a timeval struct. This also prepares for changing the UNIX
timer code to support the different timer types.

Author: Thiago Macieira <thiago.macieira@nokia.com>
Change-Id: Ie3cc1ae8f1be6a9ad3f1766051642cbf3e614418
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd Qt::TimerType argument to QAbstractEventDispatcher::registerTimer()
Bradley T. Hughes [Wed, 21 Dec 2011 10:33:33 +0000 (11:33 +0100)]
Add Qt::TimerType argument to QAbstractEventDispatcher::registerTimer()

... and deprecate the old registerTimer() functions. The new pure-
virtual registerTimer() breaks source-compatibility. Subclasses cannot
be instantiated anymore, since the pure virtual function signature has
changed.

QAbstractEventDispatcher::TimerInfo is no longer a QPair. It is now a
struct with timerId, interval, and timerType members. This is a source
incompatibility that should only affect subclasses of
QAbstractEventDispatcher, which will need to pass 3 arguments to the
TimerInfo constructor instead of 2. If the subclass used QPair<int,int>
instead of the TimerInfo typedef, the QPair<int,int> declarations will
need to be replaced with TimerInfo.

Call the new registerTimer() function with the type from
QObject::startTimer(). Change all subclasses of QAbstractEventDispatcher
to reimplement the new virtual function. The type argument is unused at
the momemnt, except to ensure that registeredTimers() returns the type
each timer was registered with. Implementations for the various
dispatchers will be done in separate commits.

Author: Thiago Macieira <thiago.macieira@nokia.com>
Change-Id: Ia22697e0ab0847810c5d162ef473e0e5a17a904b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd Qt::TimerType and the QTimer::timerType property
Bradley T. Hughes [Wed, 21 Dec 2011 10:32:43 +0000 (11:32 +0100)]
Add Qt::TimerType and the QTimer::timerType property

The timer type will control the accuracy of the timer. By default, all
timers are CoarseTimers, which allows for +/- 5% interval adjustment.
PreciseTimers will not have any interval adjustments, VeryCoarseTimers
will have intervals adjusted to full second resolution.

Use QTimer::setTimerType() or the QTimer::singleShot() overload to
specify the type.

QObject::startTimer() now takes a Qt::TimerType argument which defaults
to Qt::CoarseTimer. QBasicTimer::startTimer() gets an overload that
takes a Qt::TimerType argument. The argument is unused for now, since
the QAbstractEventDispatcher interface needs to change (done in a
separate commit).

Author: Thiago Macieira <thiago.macieira@nokia.com>
Change-Id: I3100da5aa1fe17ec30b8644897d0fe6ec4a07f52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoHandle -1 (Invalid Key) and Qt::Key_unknown gracefully in encodeString.
David Faure [Thu, 22 Dec 2011 18:02:34 +0000 (19:02 +0100)]
Handle -1 (Invalid Key) and Qt::Key_unknown gracefully in encodeString.

Previously they would fall into the unicode handling and return very
strange values.

Change-Id: I62a53894c0983bf53fd79f924b40a6fd3ba02993
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agotests: use contains(QT_CONFIG,private_tests) consistently
Sergio Ahumada [Sun, 1 Jan 2012 20:24:28 +0000 (21:24 +0100)]
tests: use contains(QT_CONFIG,private_tests) consistently

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

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

Change-Id: If36b1b8f69c3509128786fec67899ae18ffaa2bc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoUnbreak cross-compilation to ARM.
Sergio Ahumada [Sun, 1 Jan 2012 13:36:09 +0000 (14:36 +0100)]
Unbreak cross-compilation to ARM.

v8snapshot is not required to build V8

Change-Id: I75f728a1237acaac9d3a10a87673fb2b6dd2dc91
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoChange event posting to use a QVector.
Robin Burchell [Fri, 9 Dec 2011 14:05:10 +0000 (15:05 +0100)]
Change event posting to use a QVector.

This provides a ~10% improvement to the newly introduced QCoreApplication
event_posting_benchmark (a simple synthetic benchmark of creating a bunch of
events, posting them, and sending the queue).

before:
********* Start testing of QCoreApplicationBenchmark *********
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS   : QCoreApplicationBenchmark::initTestCase()
RESULT : QCoreApplicationBenchmark::signal_slot_benchmark():"1000":
     0.82 msecs per iteration (total: 53, iterations: 64)
RESULT : QCoreApplicationBenchmark::signal_slot_benchmark():"10000":
     8.6 msecs per iteration (total: 69, iterations: 8)
RESULT : QCoreApplicationBenchmark::signal_slot_benchmark():"100000":
     84 msecs per iteration (total: 84, iterations: 1)
RESULT : QCoreApplicationBenchmark::signal_slot_benchmark():"1000000":
     874 msecs per iteration (total: 874, iterations: 1)
PASS   : QCoreApplicationBenchmark::signal_slot_benchmark()
PASS   : QCoreApplicationBenchmark::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of QCoreApplicationBenchmark *********

after:
********* Start testing of QCoreApplicationBenchmark *********
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS   : QCoreApplicationBenchmark::initTestCase()
RESULT : QCoreApplicationBenchmark::event_posting_benchmark():"1000 events":
     0.781 msecs per iteration (total: 100, iterations: 128)
RESULT : QCoreApplicationBenchmark::event_posting_benchmark():"10000 events":
     7.8 msecs per iteration (total: 63, iterations: 8)
RESULT : QCoreApplicationBenchmark::event_posting_benchmark():"100000 events":
     75 msecs per iteration (total: 75, iterations: 1)
RESULT : QCoreApplicationBenchmark::event_posting_benchmark():"1000000 events":
     774 msecs per iteration (total: 774, iterations: 1)
PASS   : QCoreApplicationBenchmark::event_posting_benchmark()
PASS   : QCoreApplicationBenchmark::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of QCoreApplicationBenchmark *********

Change-Id: Ibf56d9526b0a8cbaf171008da4104bb457628172
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoFlag udpTest as insignificant, fails on Ubuntu 11.10 x64.
Toby Tomkins [Thu, 29 Dec 2011 07:26:48 +0000 (17:26 +1000)]
Flag udpTest as insignificant, fails on Ubuntu 11.10 x64.

This testcase fails on the Ubuntu 11.10 x64 platform, add flag to .pro
file so test is ignored on this platform.

Task-number: QTBUG-23380

Change-Id: I51831df8c8e9bfcf63d3689e37552ca1a62691cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdapt QGraphicsView test to QPlatformInputContext
Pekka Vuorela [Thu, 15 Dec 2011 14:49:43 +0000 (16:49 +0200)]
Adapt QGraphicsView test to QPlatformInputContext

Change-Id: I9562a0b763fe7d77cd08451426bf2ceaec00acf9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoAdapt QGraphicsScene test to use QPlatformInputContext
Pekka Vuorela [Thu, 15 Dec 2011 14:22:52 +0000 (16:22 +0200)]
Adapt QGraphicsScene test to use QPlatformInputContext

Change-Id: Iaf61798cc78e57563fee088711d39090b722a946
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoPrevent qDebug test bypassing the testlib message handler.
Jason McDonald [Fri, 30 Dec 2011 00:58:14 +0000 (10:58 +1000)]
Prevent qDebug test bypassing the testlib message handler.

Several of the test functions in the QDebug autotest call
qInstallMsgHandler() to temporarily use a custom message handler.
Unfortunately, these test functions were then resetting the message
handler back to Qt's default handler at the end of the test.

QTestLib also calls qInstallMsgHandler() to set a message handler that
redirects debug/warning/fatal messages into the test log.  When the test
resets the message handler back to Qt's default handler, testlib's
message handler is bypassed for the rest of the test, preventing any
subsequent debug/warning/fatal messages from being visible in the test
log or subject to testlib's ignoreMessage() function.

This error also caused several of the test functions to fail if they
were run manually.  The "defaultMessagehandler" test would fail if it
was run before any other test function and the "assignment" test would
fail if it was run after any other test function.

This commit fixes these failures by using a helper class to ensure that
the previously active message handler is restored at the end of each
test function, even if the test function fails or throws an exception.

Change-Id: I51376724d164c8ad126e5b9be76890bf3e6a9fb0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse QVERIFY2 to output verbose failure messages.
Jason McDonald [Thu, 29 Dec 2011 03:34:25 +0000 (13:34 +1000)]
Use QVERIFY2 to output verbose failure messages.

Change-Id: I2ce96d9d9f582e99c1d9f6dd6e6e80ce42d6e61d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCorrect misspelt function names in QFutureWatcher test.
Jason McDonald [Thu, 29 Dec 2011 01:53:54 +0000 (11:53 +1000)]
Correct misspelt function names in QFutureWatcher test.

Change-Id: I60965f3475f83a7c42d2efc6ed8adf9a1403e144
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCorrect misspelt function name in qtconcurrentmap test.
Jason McDonald [Thu, 29 Dec 2011 01:38:45 +0000 (11:38 +1000)]
Correct misspelt function name in qtconcurrentmap test.

Change-Id: I79b54b4e0de6319add89d220d3c3306556ab4ccc
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCorrect misspelt function name in qtconcurrentfilter test.
Jason McDonald [Thu, 29 Dec 2011 01:11:41 +0000 (11:11 +1000)]
Correct misspelt function name in qtconcurrentfilter test.

Change-Id: Ie7ea2defac407d099d7bb27cccfb34911b832626
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChange test to use new QTRY_COMPARE/QTRY_VERIFY macros.
Robin Burchell [Tue, 27 Dec 2011 18:46:18 +0000 (19:46 +0100)]
Change test to use new QTRY_COMPARE/QTRY_VERIFY macros.

When verifying nonzero results (i.e. that something expected *did* happen),
using these macros allows bailing out of the timer much earlier than the
potential 5 seconds.

My running this on Linux goes from ~147 seconds to ~91 seconds.

Change-Id: Ie1e41252eb4eb295b5c8e795ded02f00eb7f9387
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake qDecodeDataUrl return bool.
Jonas M. Gastal [Thu, 29 Dec 2011 14:24:17 +0000 (12:24 -0200)]
Make qDecodeDataUrl return bool.

Change-Id: I23b9fed39af7bea6c171b35e10bd72c424bd903e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoImprove QTextCodec::codecForLocale() test.
Jason McDonald [Thu, 29 Dec 2011 05:45:04 +0000 (15:45 +1000)]
Improve QTextCodec::codecForLocale() test.

Don't call QSKIP when omitting the optional part of the test, as doing
so hides the fact that the rest of the test passed.

Change-Id: I9c102e8daeaf9586b2e510c4c9ce697ead290795
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix printerPaperSize and some tst_qprinter test failures
Sergio Ahumada [Wed, 28 Dec 2011 20:28:51 +0000 (21:28 +0100)]
Fix printerPaperSize and some tst_qprinter test failures

Removing QEXPECT_FAIL accordingly.

Task-number: QTBUG-22296
Task-number: QTBUG-22562
Change-Id: I128a78897722cc067168ee50dbcbfc7537abdfcd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoEnable variadic macros if building in c++0x mode.
Stephen Kelly [Tue, 27 Dec 2011 14:06:57 +0000 (15:06 +0100)]
Enable variadic macros if building in c++0x mode.

Change-Id: I40d1f1f64ad31a299ccad9258f70e9bf3255c3cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoDon't allow QThreadPool test to hang on failure.
Jason McDonald [Wed, 28 Dec 2011 06:52:24 +0000 (16:52 +1000)]
Don't allow QThreadPool test to hang on failure.

Use QTRY_VERIFY() to fail after a reasonable timeout rather than putting
the test into an infinite loop.

Change-Id: Ie0917556e15999a94cc0587f3f4c11c0d743a228
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoClarifying the flow of signals on QNetworkAccessManager.
Jonas M. Gastal [Tue, 27 Dec 2011 19:20:04 +0000 (17:20 -0200)]
Clarifying the flow of signals on QNetworkAccessManager.

Task-number: QTBUG-22858

Change-Id: I07eaecebf17e73f9c3148465d8970ca7672a900c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAvoid repeatedly registering the same meta-type
Jason McDonald [Wed, 28 Dec 2011 05:40:50 +0000 (15:40 +1000)]
Avoid repeatedly registering the same meta-type

Register the meta-type in initTestCase(), which is run once, rather than
in init(), which is run before every test function is run.

Change-Id: Ic62a2469da6a2a85254ffc7c4d893395202c50d8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoImprove qtconcurrentthreadengine autotest.
Jason McDonald [Fri, 23 Dec 2011 05:18:16 +0000 (15:18 +1000)]
Improve qtconcurrentthreadengine autotest.

The threadCount() test function is unstable and had been disabled by
making it not be a slot.  It is better to disable it with QSKIP so that
the test output shows that the test function exists and is in need of
repair.

Change-Id: Iccdc8da31e0d15d922f7e9606835d1ff1a3a4966
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCleanup itemmodel autotests.
Jason McDonald [Fri, 23 Dec 2011 04:55:15 +0000 (14:55 +1000)]
Cleanup itemmodel autotests.

Avoid using bug tracker identifiers in test function names.  These
identifiers lose their meaning when the bug tracker is replaced.

Change-Id: Ia867f7c2ec2ab9ed546588843d532ac615a34031
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove old debug code from itemmodel tests.
Jason McDonald [Fri, 23 Dec 2011 04:14:07 +0000 (14:14 +1000)]
Remove old debug code from itemmodel tests.

Change-Id: I7c6aeed2d3b593a4dac89e54ef22743d5f736d42
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoReinstate commented test data in QItemSelectionModel test.
Jason McDonald [Fri, 23 Dec 2011 03:54:39 +0000 (13:54 +1000)]
Reinstate commented test data in QItemSelectionModel test.

The restored test data was marked as failing, but appears to pass, and
the available history does not explain why it was commented out.

Change-Id: I7e9e3ba72fc8fef42c91ee882efa98d25b3d8317
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCleanup itemmodel autotests.
Jason McDonald [Fri, 23 Dec 2011 03:13:08 +0000 (13:13 +1000)]
Cleanup itemmodel autotests.

Bring the code closer to compliance with Qt's coding style guidelines
and eliminate excessive vertical whitespace.

Change-Id: Iaa29f8edf326ddb80cbadb6c18cca4fea88fd9b2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove empty functions from itemmodels tests.
Jason McDonald [Fri, 23 Dec 2011 01:55:38 +0000 (11:55 +1000)]
Remove empty functions from itemmodels tests.

Change-Id: I23775a334812b096192c7f44c4a3cb06f4b08705
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCleanup corelib autotests.
Jason McDonald [Thu, 22 Dec 2011 07:16:48 +0000 (17:16 +1000)]
Cleanup corelib autotests.

When using QSignalSpy, always verify that the signal spy is valid.  This
will cause the test to give a meaningful failure when spying on a
non-existant signal.  Without this change, tests that spy on a signal to
ensure that it is not emitted (i.e. by comparing the spy count to zero)
could pass erroneously if something went wrong when creating the signal
spy, as an invalid QSignalSpy will always return a count of zero.

Change-Id: I41f4a63d9f0de9190a86de237662dc96be802446
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove mention of Trolltech in qlibrary autotest.
Jason McDonald [Wed, 21 Dec 2011 01:47:28 +0000 (11:47 +1000)]
Remove mention of Trolltech in qlibrary autotest.

Task-number: QTBUG-19653

Change-Id: I8cf21bac41b08187528ba7004a7a23b9baa64b17
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove mention of Trolltech from QGraphicsScene autotest.
Jason McDonald [Wed, 21 Dec 2011 01:28:57 +0000 (11:28 +1000)]
Remove mention of Trolltech from QGraphicsScene autotest.

Task-number: QTBUG-19653

Change-Id: Iabebf17f5b09c17a767e81a0ccadd03513238a75
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove mentions of Trolltech from QRegExp autotest.
Jason McDonald [Wed, 21 Dec 2011 01:26:26 +0000 (11:26 +1000)]
Remove mentions of Trolltech from QRegExp autotest.

Task-number: QTBUG-19653

Change-Id: I55ae6bed6fb2177cdc842de34ef31ae98d0d3237
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove mention of trolltech from QThreadStorage test.
Jason McDonald [Wed, 21 Dec 2011 01:17:39 +0000 (11:17 +1000)]
Remove mention of trolltech from QThreadStorage test.

Task-number: QTBUG-19653

Change-Id: I6c74a15b6c6db415a545328b73b6dd704d69bfee
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove mention of Trolltech in QHttp autotest.
Jason McDonald [Wed, 21 Dec 2011 00:47:38 +0000 (10:47 +1000)]
Remove mention of Trolltech in QHttp autotest.

The data file named "trolltech" has nothing specific to Trolltech in its
contents.  Rename it to "testhtml".  The lack of a file extension is
intentional.

Task-number: QTBUG-19653
Change-Id: Idc5c5f4ffa447151e47f66ff7364f0fa8753a699
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove non-const getters marked for elimination.
Robin Burchell [Tue, 20 Dec 2011 14:31:41 +0000 (15:31 +0100)]
Remove non-const getters marked for elimination.

These all have consted overloads, so there's no need for them.

Change-Id: I3d4f63b8eb8f1b7df7fa772d6172e0a954184d24
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoMerge QTextDocumentFragment::toHtml() overload per Qt 5 comment.
Robin Burchell [Tue, 20 Dec 2011 17:14:58 +0000 (18:14 +0100)]
Merge QTextDocumentFragment::toHtml() overload per Qt 5 comment.

Change-Id: Ic8850684c2298b996354e27cc96ad6486d7a3679
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix typos parametter -> parameter.
Stephen Kelly [Fri, 23 Dec 2011 13:26:59 +0000 (14:26 +0100)]
Fix typos parametter -> parameter.

Change-Id: I0ebb3658477a1afdc1af5f4f6f64f12dc20ace56
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoIncrease the value of the UserRole for the ItemDataRole enum.
Stephen Kelly [Mon, 19 Dec 2011 17:49:44 +0000 (18:49 +0100)]
Increase the value of the UserRole for the ItemDataRole enum.

For future proofing. No need for it to be so small.

Change-Id: I8a0c734f87671881f114922ada7c5bc9524de19b
Reviewed-by: Marius Bugge Monsen <marius@cutehacks.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReplace a pseudo-virtual slot with a virtual method.
Stephen Kelly [Mon, 19 Dec 2011 18:08:07 +0000 (19:08 +0100)]
Replace a pseudo-virtual slot with a virtual method.

Change-Id: I5d0e1e54e0d3d441b71b7594bc14e872512cc937
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQLocalSocket shouldn't emit disconnected if it isn't connected yet.
Jonas M. Gastal [Mon, 19 Dec 2011 15:55:29 +0000 (13:55 -0200)]
QLocalSocket shouldn't emit disconnected if it isn't connected yet.

Task-number: QTBUG-22082
Change-Id: I2e1dae133f50a232d4be3ff63cafaf1b417b286c
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoadd tests and benchmarks for QString::toLower()/toUpper()/toCaseFolded()
Konstantin Ritt [Tue, 18 Oct 2011 17:12:18 +0000 (19:12 +0200)]
add tests and benchmarks for QString::toLower()/toUpper()/toCaseFolded()

Merge-request: 70
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I3929d4d8963c3cef6d2c6420d8ad1f7a45f7e042
Reviewed-by: Olivier
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agonetwork auto tests: add QNetworkReply test for pipelining
Peter Hartmann [Thu, 17 Nov 2011 10:19:33 +0000 (11:19 +0100)]
network auto tests: add QNetworkReply test for pipelining

Reviewed-by: Markus Goetz
Task-number: QTBUG-21369
(cherry picked from commit a32bfdef6d6b45c916f143dcf8495a2e102c3eec)

Change-Id: Iecde23c56f128008c5172675601928d83180358a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix crashes and non-portable functionality in QDBusDemarshaller QByteArray extraction
Sami Rosendahl [Tue, 22 Nov 2011 11:52:15 +0000 (13:52 +0200)]
Fix crashes and non-portable functionality in QDBusDemarshaller QByteArray extraction

QDBusArgument QByteArray extraction operator and QDBusDemarshaller that
implements the extraction do not check the type of the extracted value.
When extracting a QByteArray when the value actually is e.g. a struct of
mixed types the byte array extraction will crash as it attempts to extract
the struct data as a fixed array.

The fix adds DBus type checks to QDBusArgument byte array extraction
operator implementations.
The checks invalidate extracting arrays of other types than bytes to a
QByteArray that worked with the unchecked implementation. The rationale
for this restriction is
1) extracting a QByteArray to a variant checks already that the array
   element type is byte
2) Results of extracting arrays of types wider than a byte to a QByteArray
   are architecture-dependent making such code inherently non-portable.

Task-number: QTBUG-22840
Change-Id: Ie20f2adc06c697a68055c803215fb408568fdd90
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix crash in QDBusDemarshaller QStringList extraction
Sami Rosendahl [Mon, 5 Dec 2011 11:06:40 +0000 (13:06 +0200)]
Fix crash in QDBusDemarshaller QStringList extraction

QDBusArgument QStringList extraction operator and QDBusDemarshaller that
implements the extraction do not check the type of the extracted value.
When extracting a QStringList and the value actually is e.g. an array of
bytes the string list extraction will crash as it interprets the bytes as
char pointers.

The fix adds DBus type checks to QDBusArgument QStringList extraction
operator implementations.
The checks are as permissive as possible provided crashes are avoided.

Task-number: QTBUG-22840
Change-Id: I4b67d75b59c5052d939f3a69f3e92dabdb3bdd6b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix crash in QDBusDemarshaller basic string-like type extraction
Sami Rosendahl [Fri, 25 Nov 2011 09:13:46 +0000 (11:13 +0200)]
Fix crash in QDBusDemarshaller basic string-like type extraction

QDBusArgument string extraction operators and QDBusDemarshaller that
implements the extraction do not check the type of the extracted value.
When extracting string-like basic DBus type that actually is e.g. an
integer the string extraction will crash as it blindly attempts to use the
integer as a pointer to char.

The fix adds DBus type checks to QDBusArgument string type extraction
operator implementations.
The checks are as permissive as possible provided crashes are avoided.
Previously supported functionality of extracting an object path or type
signature to a string type is retained.

Task-number: QTBUG-22840
Change-Id: I29be1ae592658ca268c65ed692e1d42619d52280
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoImprove QSettings autotest
Jason McDonald [Fri, 23 Dec 2011 05:35:32 +0000 (15:35 +1000)]
Improve QSettings autotest

QTestLib-based autotests cannot perform verification steps in the test
class constructor.  This needs to be done in initTestCase() instead.

Change-Id: Ib1f7f838f052fa0fc5104603bdac01ffd8313aef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove empty functions from QSet autotest.
Jason McDonald [Fri, 23 Dec 2011 05:52:54 +0000 (15:52 +1000)]
Remove empty functions from QSet autotest.

Change-Id: Id6fac3a83e3f4385ee1978a19e6dc92605f4abdb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoBuild fix for tst_qprinter with c++11
Jędrzej Nowacki [Thu, 22 Dec 2011 14:44:28 +0000 (15:44 +0100)]
Build fix for tst_qprinter with c++11

GCC 4.6 fails to build the test because of narrowing conversion.

Change-Id: I927693789be7f3df7bd1a96c8924fc04716a03f0
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agov8: Build V8 for FreeBSD
Holger Hans Peter Freyther [Fri, 23 Dec 2011 21:35:42 +0000 (22:35 +0100)]
v8: Build V8 for FreeBSD

For FreeBSD the libexecinfo port needs to be installed and linked to, all
tests execute and pass.

%uname -a
FreeBSD qt-ppa 8.2-STABLE FreeBSD 8.2-STABLE #4: Sun Oct 30 20:43:37 UTC 2011     ich@freebsd:/usr/obj/usr/src/sys/GENERIC  amd64
%./tst_v8
********* Start testing of tst_v8 *********
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS   : tst_v8::initTestCase()
PASS   : tst_v8::eval()
PASS   : tst_v8::evalwithinwith()
PASS   : tst_v8::userobjectcompare()
PASS   : tst_v8::externalteardown()
PASS   : tst_v8::globalcall()
PASS   : tst_v8::cleanupTestCase()
Totals: 7 passed, 0 failed, 0 skipped
********* Finished testing of tst_v8 *********

Change-Id: Ia8198128126c2931807c7fb872c15baad47022e1
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>