profile/ivi/qtbase.git
12 years agomoc: fix Q_INVOKABLE returning references
Olivier Goffart [Tue, 15 Nov 2011 09:14:23 +0000 (10:14 +0100)]
moc: fix Q_INVOKABLE returning references

The moc generated code would not compile otherwise

Keep Moc::parseFunction and Moc::parseMaybeFunction in sync
(the first is used for signals and slots, and the second for normal
 functions such as Q_INVOKABLE)
Last patch that introduced function pointer updated parseFunction
but not parseMaybeFunction

When a slot return a reference, moc generate code that make the
MetaObject system think it is a void, so qt_metacall and invokeMethod
do not mess with the return value.
But when we want to take the function signature, in the IndexOfMethod
call, we need to have the exact return type.

Change-Id: I4661218d7ce367ad3934e73929e7d04f0a6dbc09
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdd valgrind suppression files.
Morten Sorvig [Wed, 19 Oct 2011 13:06:45 +0000 (15:06 +0200)]
Add valgrind suppression files.

Change-Id: I35626479267de49924038a0aa93103a14f05702a
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoAlways use the hex format for certificate serial numbers.
Richard Moore [Thu, 10 Nov 2011 22:37:16 +0000 (22:37 +0000)]
Always use the hex format for certificate serial numbers.

In Qt 4.x the serial number is reported by a mixture of the hex value
and the number, The hex is what is used by other tools, and we should do
the same.

Change-Id: Ia0361d43fb5b920d053c95e932e0c8a012436e5e
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoQEventDispatcherQPA: processEvents should only be called once
Olivier Goffart [Mon, 14 Nov 2011 21:35:05 +0000 (22:35 +0100)]
QEventDispatcherQPA: processEvents should only be called once

This caused a "deadlock" in tst_qobject::moveToThread

The problem was that QEventLoop::quit was called from the first
prcessed event in that loop, put calling process event a second time
deadlock because there is no more event to process

(In practice, some event can come from the window manager or the
inputs, but they may as well not come)

Change-Id: Ia469110eb9c9de57669e80cf19e933f410e469a4
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAllow to create a custom event dispatcher for specific QThreads.
Sven Anderson [Thu, 8 Sep 2011 15:40:55 +0000 (17:40 +0200)]
Allow to create a custom event dispatcher for specific QThreads.

QAbstractEventDispatcher() does no longer install itself into the current
thread.  Instead the new methods QThread::setEventDispatcher() and
QCoreApplication::setEventDispatcher() allow to install a custom event
dispatcher into any QThread as long as there is no default event dispatcher
created yet.  That is, before the thread has been started with
QThread::start() or, in case of the main thread, before QCoreApplication has
been instantiated.

Change-Id: I7367e13d8d8aebed5a5651260bb69b8818eb1b90
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove obsolete QSKIP parameter.
Jason McDonald [Wed, 9 Nov 2011 00:31:43 +0000 (10:31 +1000)]
Remove obsolete QSKIP parameter.

Change-Id: I269337d802ec6b383a496fe8dc62a6b11e4d61c5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCompile on Mac OS X
Bradley T. Hughes [Mon, 7 Nov 2011 11:44:20 +0000 (12:44 +0100)]
Compile on Mac OS X

privateqt_mac_p.h lives in QtWidgets/private/qt_mac_p.h now instead of
QtGui/private/...

Change-Id: I77e57de5581829e78919b13b10f7a896879670a7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoIntegrate testcocoon support into Qt build system.
Rohan McGovern [Thu, 23 Jun 2011 08:48:33 +0000 (10:48 +0200)]
Integrate testcocoon support into Qt build system.

To instrument a Qt application or library with the TestCocoon coverage
tool, do `CONFIG+=testcocoon' in the application .pro file.

To instrument Qt itself with testcocoon, use the `-testcocoon' configure
option.

Change-Id: Ie77109a078d11ea51f7a073621e0df9c752c44ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake QTest::qWait() handle DeferredDelete event
Charles Yin [Fri, 11 Nov 2011 01:33:41 +0000 (11:33 +1000)]
Make QTest::qWait() handle DeferredDelete event

The QTest::qWait() function does not handle DeferredDelete, in this case
all deleteLater() calls before the qWait() won't be processed during the
wait. Add an explicit sendPostedEvents(0, QEvent::DeferredDelete) to fix
this problem.

Task-number:QTBUG-22633
Change-Id: I2c5574b4e7d3c070fad6382dc36ddfd1dfac50d6
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoAvoid crash in QColumnView autotest.
Jason McDonald [Mon, 14 Nov 2011 04:10:59 +0000 (14:10 +1000)]
Avoid crash in QColumnView autotest.

When combined with http://codereview.qt-project.org/8644, the test
crashes.  This appears to be due to a column of the view being deleted
in response to calling setCurrentIndex(), as documented in QTBUG-22707.

This commit must be merged at the same time as
http://codereview.qt-project.org/8644.

Task-number: QTBUG-22707
Change-Id: I075be7df5d9196e37e2286e61d317086a76a167d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDo not add QPF fonts to basic font db
Jiang Jiang [Mon, 14 Nov 2011 10:47:03 +0000 (11:47 +0100)]
Do not add QPF fonts to basic font db

QPlatformFontDatabase::populateFontDatabase() routine uses a different
usrPtr format which is not compatible with the one basic font db uses
(FontFile *). We shouldn't mix them together.

Task-number: QTBUG-22713
Change-Id: I239ea085e14261f6b9ba66b03710a590a44378f9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoProperly handle position in non-synthetic ConfigureNotify with xcb
Laszlo Agocs [Sat, 5 Nov 2011 12:00:53 +0000 (14:00 +0200)]
Properly handle position in non-synthetic ConfigureNotify with xcb

The received window position cannot be trusted blindly, e.g. in case
of resizing a window via the mouse or calling showMaximized() the
position is bogus (for our purposes). Instead, it needs to be queried.

Before 37f338e5edc6d7b70b5a4eaf63326f2a22d7bfbd an incomplete
workaround was in place however it got removed in that commit,
resulting in weird off-by-a-certain-amount mouse position issues in
certain use cases. This patch aims to fix the issue similarly to how
it was done in Qt4.

Change-Id: I2d2a69b81a2782117b700fe366fae4c102aca1f4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoDocument QPlatformInputContext
Pekka Vuorela [Fri, 11 Nov 2011 08:42:28 +0000 (10:42 +0200)]
Document QPlatformInputContext

Change-Id: I8f7599ed1f03d29a11713c7a11ed5b61a17e3dfe
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoFix for QMessageBox's autotest.
Mikko Knuutila [Mon, 14 Nov 2011 09:18:22 +0000 (10:18 +0100)]
Fix for QMessageBox's autotest.

Mnemonic shortcut caused string comparison to fail.

Task-number: QTBUG-22119

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 11a6d868b5613dd7fdbef02198aaf9566fcd1f17)
Change-Id: I11a6d868b5613dd7fdbef02198aaf9566fcd1f17

12 years agoFix for the button size calculation in qmessagebox.cpp
Mikko Knuutila [Mon, 14 Nov 2011 09:18:21 +0000 (10:18 +0100)]
Fix for the button size calculation in qmessagebox.cpp

Actually use the calculated size for needed space instead of just
ignoring the return value.

Task-number: QTBUG-16315

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 0792215fa8d227617a2080af9f12fd7f486b87d6)
Change-Id: I0792215fa8d227617a2080af9f12fd7f486b87d6

12 years agoDisable qmacstyle test on Mac OS X
Bradley T. Hughes [Mon, 7 Nov 2011 11:49:08 +0000 (12:49 +0100)]
Disable qmacstyle test on Mac OS X

The QMacStyle is not built as part of QtWidgets at the moment (see the
TODO in src/widgets/styles/styles.pri), so disable the test for now.

I've included a comment in styles.pri to re-enable the test once the
style is done.

Change-Id: Ia6ea130135586f107ba257bf2c6c2c7187a830b6
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoAutotests need to link to QtTestLib
Bradley T. Hughes [Mon, 7 Nov 2011 11:43:20 +0000 (12:43 +0100)]
Autotests need to link to QtTestLib

Otherwise the symbols used by the test aren't found when linking.

Change-Id: Ibc78ac76763d0558824b797582e16f97786c5840
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoCompile with non-C++11 compilers
Bradley T. Hughes [Mon, 7 Nov 2011 11:40:10 +0000 (12:40 +0100)]
Compile with non-C++11 compilers

Function pointers used as template parameters must have external linkage
according to the C++ standard. The _mm_lddqu_si128() and
_mm_load_si128() intrinsic functions are declared static in most
implementations, which means we need to wrap them in a non-static
function call to be used.

Change-Id: I4e316851df890d77999649d47654f7f9a35d4080
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDefine __GNUC__ to be 4 on Mac OS X
Bradley T. Hughes [Fri, 4 Nov 2011 10:40:19 +0000 (11:40 +0100)]
Define __GNUC__ to be 4 on Mac OS X

The QMAKE_COMPILER_DEFINES are used when running moc. In some cases, Qt
checks the __GNUC__ value to determine which version of GCC is being
used. In particular, the qtconcurrentfilter and qtconcurrentmap tests
fail to compile because moc ends up defining QT_NO_CONCURRENT_FILTER and
QT_NO_CONCURRENT_MAP since the condition __GNUC__ < 4 evaluates to true.

The Mac OS X development tools have not used gcc 3.x is a very long
time. The current version ships with llvm-gcc-4.2.1 and clang (which
also masquerades as gcc 4.2.1). Defining __GNUC__=4 makes sure that moc
preprocesses headers in the same way the compiler does.

Change-Id: Ie491d3f5b074fd1a509ffe6755f3308836817b6c
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoFix config tests for modules on Mac OS X
Tor Arne Vestbø [Mon, 14 Nov 2011 12:16:12 +0000 (13:16 +0100)]
Fix config tests for modules on Mac OS X

We look for a regular binary, but Mac OS X produces application bundles
by default. Instead of looking for an app bundle as well, we unify things
a bit by disabling app bundles instead.

Change-Id: I5eb173d98e893e616f23b91f13282cf95ef4f56a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoHTTP: blacklist server for pipelining
Peter Hartmann [Mon, 14 Nov 2011 15:21:38 +0000 (16:21 +0100)]
HTTP: blacklist server for pipelining

that server was found out not to support HTTP pipelining.

tested manually; for more information see the task.

Change-Id: I9120e8be1a9a05f39f99752d6426c92fa3d093f2
(cherry picked from commit ec6d7694f72498d1b156bb0ae8d305e01931f7b2)
Reviewed-by: Markus Goetz
Task-number: QTBUG-21369
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSupport 31 mouse buttons (with platform plugins xcb and xlib).
Rick Stockton [Thu, 10 Nov 2011 05:02:18 +0000 (21:02 -0800)]
Support 31 mouse buttons (with platform plugins xcb and xlib).

This commit includes changes for mouse button support within the XCB
and XLIB platform plugins. Support in other platform plugins will be
added in the future. The namespace update is prerequisite to compile
the the Plugins, and the update in qguiapplication.cpp is required for
the enhancements to actually work.

Task-number: QTBUG-22642
Change-Id: Ie18fca3b9c86d0b6abbf2103a4f8582e6ce83e7d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix source incompatibility for QVariant{Map, Hash, List}
Jędrzej Nowacki [Fri, 11 Nov 2011 12:03:15 +0000 (13:03 +0100)]
Fix source incompatibility for QVariant{Map, Hash, List}

Change 7f35d5849e7233efac16c12271c58a049923b1c0 (Refactor QMetaType
types.) introduced a source incompatibility by moving typedefs for
QVariantHash, QVariantList and QVariantMap from qvariant.h file to
qmetatype.h.

The main issue here is that syncqt script is not able to distinguish
between a forward declared typedef and definition of a typedef as they
look same in source code. So generated header files for the typedefs
were pointing wrongly to qmetatype.h which didn't have full definition
of QVariant.

Change-Id: I0268c666efd0f91d76af0ff91fb30525e3dd6223
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
12 years agoAdd a new handler to syncqt for explicitly dealing with special case headers
Kevin Simons [Fri, 4 Nov 2011 11:20:49 +0000 (12:20 +0100)]
Add a new handler to syncqt for explicitly dealing with special case headers

Change-Id: I83b26fc88aee0052502c0a4d385ea97f8c933c66
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agonetwork: remove Symbian specific code
Peter Hartmann [Tue, 1 Nov 2011 13:20:19 +0000 (14:20 +0100)]
network: remove Symbian specific code

removes several files and cleans up the code, removing all Symbian
specific #ifdef's etc.

Change-Id: Ie457e54cb4b3a992f251383320d47822259c38f1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agomoc: support mapping pointers to member functions to indexes
Olivier Goffart [Mon, 31 Oct 2011 14:22:31 +0000 (15:22 +0100)]
moc: support mapping pointers to member functions to indexes

This change adds QMetaObject::IndexOfMethod as a parameter to
the qt_static_metacall function.
It lets the moc generated code return the index of a signal or slot
given its pointer to member function

This is required to support the new connection syntax

Change-Id: I39198c6699b5aa3599d3d282f7ac79b1e3684d33
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove unused Mac code
Jiang Jiang [Mon, 14 Nov 2011 09:45:51 +0000 (10:45 +0100)]
Remove unused Mac code

Change-Id: I226ff0928cdeb70bb7f71ccace5066a430c3b05c
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDeprecate QSslCertificate::isValid() replace with isBlacklisted()
Richard Moore [Fri, 11 Nov 2011 23:08:42 +0000 (23:08 +0000)]
Deprecate QSslCertificate::isValid() replace with isBlacklisted()

Currently isValid wrongly gives the impression it checks a certificate
for validity - it doesn't. It merely checks if the certificate dates
are valid and if the certificate is blacklisted. Since it's already
easy for users to check the dates, let's just give them access to the
ability to check for blacklisting.

Change-Id: I25be3bde6a01063034702a9574b28469bf4882cd
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoFix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
jahonkon [Fri, 11 Nov 2011 09:59:47 +0000 (10:59 +0100)]
Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag

It is not possible to select text with keyboard when specifying only
Qt::TextSelectableByKeyboard flag.

Task-number: QTBUG-18952

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 054fa68b6ae852e84f2d44a73260b4282286f5ab)
Change-Id: I054fa68b6ae852e84f2d44a73260b4282286f5ab

12 years agoMac: Fix the color of check marks in menus with stylesheet
Tero Ahola [Fri, 11 Nov 2011 12:03:02 +0000 (13:03 +0100)]
Mac: Fix the color of check marks in menus with stylesheet

Task-number: QTBUG-16989

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit 22c7a2f69e833789e9b5613f809ea43561624482)
Change-Id: I22c7a2f69e833789e9b5613f809ea43561624482

12 years agoAdded base 10 to be used with QIntValidator.
Mikko Knuutila [Fri, 11 Nov 2011 13:15:29 +0000 (14:15 +0100)]
Added base 10 to be used with QIntValidator.

Fixes an error in QIntValidator, which occurred because
locale.toInt() was missing a parameter for base value and this
led it to presume wrongly that a base 8 is in use.

Task-number: QTBUG-21602

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit ee3f763f3642d1a098e6293fbc586b34a3e6e8be)
Change-Id: Iee3f763f3642d1a098e6293fbc586b34a3e6e8be

12 years agoFixed wrong QGroupBox check state
Markku Heikkila [Fri, 11 Nov 2011 13:35:23 +0000 (14:35 +0100)]
Fixed wrong QGroupBox check state

Handle mouserelease only if mouse is pressed in QGroupBox.

Task-number: QTBUG-19170

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit df819cfe17f6dfd089096063524932fc4975804f)
Change-Id: Idf819cfe17f6dfd089096063524932fc4975804f

12 years agoFix QDateEdit calendar pop-up having wrong date
jahonkon [Fri, 11 Nov 2011 09:07:42 +0000 (10:07 +0100)]
Fix QDateEdit calendar pop-up having wrong date

When the calendar pops up it moves the date to maximum instead of
keeping the current date. Problem was caused by QCalendarPopup
signalling date change to QDateTimeEdit during internal date
synchronization from QDateTimeEdit to QCalendarPopup.

Task-number: QTBUG-11422

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
(cherry picked from commit b0c09896a239197411027e773214a2635744695c)
Change-Id: Ib0c09896a239197411027e773214a2635744695c

12 years agoWindows platform plugin: Fix compilation with MinGW.
Friedemann Kleint [Mon, 14 Nov 2011 08:59:39 +0000 (09:59 +0100)]
Windows platform plugin: Fix compilation with MinGW.

Change-Id: Ibecfc7c5314d0dea7d796cbc586e5db05e2a80ee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoDon't pass irrelevant arguments to the compiler
Bradley T. Hughes [Tue, 8 Nov 2011 16:59:11 +0000 (17:59 +0100)]
Don't pass irrelevant arguments to the compiler

When building for 64-bit, don't pass options for 32-bit code generation,
and vice versa. This silences numerous warnings while building QtGui.

clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'

Change-Id: If4313b151e73db88d516998e3cf546e62495c289
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoDon't use deprecated functions on Mac OS X
Bradley T. Hughes [Tue, 8 Nov 2011 16:35:03 +0000 (17:35 +0100)]
Don't use deprecated functions on Mac OS X

io/qfilesystemwatcher_fsevents.cpp:346:15: warning: 'stat64' is
deprecated [-Wdeprecated-declarations]
        if (::stat64(it->absolutePath, &newInfo) == 0) {
              ^

According to 'man 2 stat' on Mac OS X, the stat64() function is
deprecated in 10.6 and above. Instead, we are supposed to define
the _DARWIN_USE_64_BIT_INODE which enables the 64-bit ino_t member in
the stat struct and uses function symbol suffixes to call the correct
version of stat with 64-bit inode support.

Change-Id: I697374186c7f4d69df783f06962ca5644222194d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCleanup corelib autotests
Jason McDonald [Thu, 10 Nov 2011 02:59:56 +0000 (12:59 +1000)]
Cleanup corelib autotests

Remove various disabled and/or non-helpful debugging code.

Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.  Diagnostics should also be informative -- simply
printing the value of a variable with no other information about what is
being printed (or why it is being printed) is not informative.

Change-Id: I21a6c2121be86001bb57e80f426507b6e619ee9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove commented code from qfuture test.
Jason McDonald [Fri, 11 Nov 2011 03:30:00 +0000 (13:30 +1000)]
Remove commented code from qfuture test.

The removed code was already commented out when first added in November
2007 and is nowhere near compiling.  If there was anything of value
here, anyone who is able to find it is free to re-add a version that
actually works.

Change-Id: I4a7127a272254224f6a1e65fbd2a01000a4d2be9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUpdate V8
Kent Hansen [Fri, 11 Nov 2011 11:45:37 +0000 (12:45 +0100)]
Update V8

Fixes a bug in one of our patches that caused
hydrogen to optimize incorrectly.

Task-number: QTBUG-22679
Change-Id: I008088cd2b878f22e6a2ba4e002aeba9a3c70a22
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRe-enabled tst_qpluginloader
Jo Asplin [Fri, 11 Nov 2011 14:24:17 +0000 (15:24 +0100)]
Re-enabled tst_qpluginloader

This test is passing in CI.

Task-number: QTBUG-21402
Change-Id: I356476e458cac1cd434959fdf801011a607c9233
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agofix makefiles again
Oswald Buddenhagen [Fri, 11 Nov 2011 15:38:16 +0000 (16:38 +0100)]
fix makefiles again

Change-Id: I981a62e8884f5c68e3f6c4b7b2f142bf75007f99
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix warning in tst_qobject
Olivier Goffart [Fri, 11 Nov 2011 15:37:23 +0000 (16:37 +0100)]
Fix warning in tst_qobject

signal4 is not used in that function

Change-Id: I69f39a4639bfae067c411fd1166fc36ca3febbc5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoFix symbol fonts support with FT engine
Jiang Jiang [Thu, 10 Nov 2011 18:04:14 +0000 (19:04 +0100)]
Fix symbol fonts support with FT engine

It appears that the symbol_map we obtained with FreeType doesn't
work for common symbol fonts like Wingdings, in previous X11 code
we use the code path with normal charmap, to enable it we need to
make sure QT_NO_FONTCONFIG is not defined. And since the FcCharset
functions doesn't really operates on the font database, we can
safely skip the mutex calls.

Change-Id: I8c484de200be1d47c053b10be2c51d2273dcd359
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix application font loading in basic font db
Jiang Jiang [Thu, 10 Nov 2011 17:01:56 +0000 (18:01 +0100)]
Fix application font loading in basic font db

We need to reregister fonts in initializeDb because basic font db
doesn't have an internal record like fontconfig does, so just
repopulating the font database won't work. db->reregisterAppFonts
is now used properly as intended (reregister application fonts
after the system font database has been cleared).

Also, static variable 'initialized' in initializeDb() is removed
since we check privateDb()->count to see if it needs to be populated
again.

Task-number: QTBUG-22063

Change-Id: Ifc66392b56b72acbe08b99256c61421c204be5d7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoReplace fixqt4headers shell script
Harald Fernengel [Fri, 11 Nov 2011 08:57:44 +0000 (09:57 +0100)]
Replace fixqt4headers shell script

Use a perl script with a slightly better scalability. No more
quadratic behavior, takes about 10 seconds (instead of 5 hours)
on my machine to fix all QtCreator headers

Change-Id: Ic7d00c28aec390a1da27a969ece5d8102674e919
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd Qt's debug/release mode to the lancelot autotests' client info
aavit [Fri, 11 Nov 2011 11:46:24 +0000 (12:46 +0100)]
Add Qt's debug/release mode to the lancelot autotests' client info

Change-Id: I146c035c241475e9851d11abfd3f50676c8e8bca
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFactor out QPlatformTheme from QPlatformPlugin.
Friedemann Kleint [Fri, 11 Nov 2011 13:50:20 +0000 (14:50 +0100)]
Factor out QPlatformTheme from QPlatformPlugin.

Implement QCocoaPlatformTheme. The menus and dialog
API is moved from the platform to the theme plugin.
(Both APIs contain references to QtWidget classes,
which we are working towards removing.)

The theme plugin is created after the platform
plugin, first by asking the platform plugin, then
by looking for a separate plugin if the platform
does not specify a theme.

Initial-patch-by: Morten Sorvig <msorvig@trolltech.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: I2778cdd3a205c4ce35ead93e39fe6b4cd58a39f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoDocument QInputPanel API
Joona Petrell [Thu, 10 Nov 2011 14:42:50 +0000 (16:42 +0200)]
Document QInputPanel API

Change-Id: Ie64215529139e18a0a575e149289b6fa9a699a69
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdd a -force-asserts option to configure
Harald Fernengel [Fri, 11 Nov 2011 10:21:52 +0000 (11:21 +0100)]
Add a -force-asserts option to configure

We have the following scenario: Either you build a release package
without asserts, or a debug package with asserts. However, in embedded
development, we need asserts also in release packages. This flag allows
you to build a release package, but Q_ASSERTs still fire.

Change-Id: Icd1dd4dd63c3cafecf515b40741263d902ad42d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd API to clear the current index. Symmetric with clearing selection.
Stephen Kelly [Thu, 10 Nov 2011 19:34:46 +0000 (20:34 +0100)]
Add API to clear the current index. Symmetric with clearing selection.

Change-Id: I08070f4fdf26898d5b6edd5259f011f9b3c75512
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMake this API virtual to make selection proxying possible.
Stephen Kelly [Thu, 10 Nov 2011 12:24:33 +0000 (13:24 +0100)]
Make this API virtual to make selection proxying possible.

Change-Id: Ie93c8b38c59d347026a68eae03687d9017b3d048
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoQPlatformDialogHelper: Split class hierarchy, decouple from Dialog
Friedemann Kleint [Thu, 10 Nov 2011 12:07:01 +0000 (13:07 +0100)]
QPlatformDialogHelper: Split class hierarchy, decouple from Dialog

- Introduce hierarchy of QPlatformDialogHelper-derived classes
  for font, color and file dialogs.
- Start reducing dependencies on QDialog:
  * Remove QDialog-specifics from interface, introduce enumeration
    for DialogCode
  * Make the helpers Q_OBJECTS to be able to add the signals
    passed on to the QDialogs
  * Remove QDialogPrivate pointer
- Split setVisible_sys() in show_sys() (factory method for native
  dialogs) and hide_sys(). Pass parent window to  show_sys(),
  removing the necessity to query the QDialog for it
- Introduce a styleHint() similar to QGuiApplication's for
  platform-specific
- Fix compile in cocoa/windows, reduce depency on QDialog
  (-private) classes.

Change-Id: Ic1cb715e1edf767f2cb18b9780341d189339ef1d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoPrefer organizationDomain or CFBundleIdentifier for settings file
Chris Meyer [Wed, 9 Nov 2011 18:44:32 +0000 (10:44 -0800)]
Prefer organizationDomain or CFBundleIdentifier for settings file

Watch for attempts to write to "Trolltech" preferences and use
QCoreApplication::organizationDomain() instead. If that doesn't exist,
then fall back to CFBundleIdentifier if possible. If that doesn't
exist, then follow the old code path and use the hardcoded string.

This change eliminates extra files being created which helps Mac app
store acceptance.

Change-Id: I1ba3984b46cf3888f371d87f6ad8ea6c2f26d2ec
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQByteArray autotest: Check for defines inside of slot
Oliver Wolff [Thu, 10 Nov 2011 09:28:56 +0000 (10:28 +0100)]
QByteArray autotest: Check for defines inside of slot

Instead of creating slots depending on certain defines,
these defines should be checked inside the slots.
Moc may not be aware of all defines (e.g. compiler
specific ones) and thus (not) create slots according
to the condition given.

Change-Id: I50495444b8f468ec131e6a0937e18803a8077758
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoAdded QTBUG-22296 to QEXPECT_FAILs
Jo Asplin [Thu, 10 Nov 2011 10:00:02 +0000 (11:00 +0100)]
Added QTBUG-22296 to QEXPECT_FAILs

Change-Id: I6c619cea64a14d957077813256c7d4f7ff6a4220
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoRepaint QProgressBar when minimum or maximum changed
Tero Ahola [Fri, 11 Nov 2011 08:22:43 +0000 (09:22 +0100)]
Repaint QProgressBar when minimum or maximum changed

The implementation of QProgressBar::setMinimum and setMaximum did not
repaint the widget. This caused the widget to be shown incorrectly in
case you call setMinimum or setMaximum but not setValue.

Task-number: QTBUG-22121
(cherry picked from commit b1998f4f59c3b10700963b2d13a17a0cc77ef665)

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: I331d37ab4451d9e096cdf91a9e0a0286bc3cdffb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix QProgressBar causing timer event spam
Tero Ahola [Fri, 11 Nov 2011 08:13:07 +0000 (09:13 +0100)]
Fix QProgressBar causing timer event spam

On Windows you will get a lot of timer events if you use QProgressBar
widget. This is because QWindowsStyle uses a timer to animate a
progress bar with unknown state (min and max values both zero). The
issue was fixed by starting the timer only if needed.

Task-number: QTBUG-10501
(cherry picked from commit  72e61b127470b044e370af7017fa8a5b0538244f)

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: If9ff2ab99929d9b85a7ffa8f6fd47b045b982f67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdding test for custom bezier easing curves
Thomas Hartmann [Thu, 10 Nov 2011 11:09:29 +0000 (12:09 +0100)]
Adding test for custom bezier easing curves

I added unit tests _fast_cbrt() taken from qeasingcurve.cpp

Change-Id: Id3afd26efac92f594d6358dc2e11f94e8c524da2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoavoid type aliasing
Thomas Hartmann [Thu, 10 Nov 2011 10:16:56 +0000 (11:16 +0100)]
avoid type aliasing

For -O2 gcc activates -fstrict-aliasing. As a result the compiler is
allowed to assume that pt[1]=px[1]/3+B1 does not affect t.

Therefore the result of _fast_cbrt() was always 0.
Using a union for casting avoids this issue.

For more details see:
http://labs.qt.nokia.com/2011/06/10/type-punning-and-strict-aliasing

Also the updated code respect endianness.

Change-Id: Id4bed16efac52e494e7357dc2f23f94e8c525df1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoCleanup corelib autotests
Jason McDonald [Thu, 10 Nov 2011 03:10:40 +0000 (13:10 +1000)]
Cleanup corelib autotests

Use QVERIFY2 to provide better test diagnostics.

Change-Id: I128004f4ee133ceed4d8f373bbbe4a0eee431ebf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse qWarning() to output warnings.
Jason McDonald [Thu, 10 Nov 2011 03:07:57 +0000 (13:07 +1000)]
Use qWarning() to output warnings.

Change-Id: I366f70f27de0329749e5dcbdcbec8d56bffb4255
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCleanup corelib autotests
Jason McDonald [Mon, 7 Nov 2011 06:46:52 +0000 (16:46 +1000)]
Cleanup corelib autotests

Tidy the autotest .pro files.  Most autotest .pro files should look like
this:

CONFIG += testcase
TARGET = tst_something
QT = core testlib
SOURCES = tst_something.cpp

Change-Id: I877c2194e9fa9dd13478d117895e1e255a948ad7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd missing naming for libraries built statically.
Caroline Chao [Fri, 16 Sep 2011 06:14:03 +0000 (08:14 +0200)]
Add missing naming for libraries built statically.

Extension .a for Mac and Linux and .lib for Windows.

Change-Id: I1e979b2a6b29eeab35620aa0bbabb27f10cdda68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoSplit TARGET_BASEPATH from breakpad.
Caroline Chao [Tue, 5 Jul 2011 14:15:52 +0000 (16:15 +0200)]
Split TARGET_BASEPATH from breakpad.

TARGET_BASEPATH becomes QMAKE_RESOLVED_TARGET.

QMAKE_RESOLVED_TARGET will be reused for future implementation
of code coverage tool TestCocoon.

Creating of resolve_target.prf.

Clean unused "unset(SYMBOLFILENAME)" in default_post.prf.

Change-Id: I054efb0065fa06697b60ac60a9ddf364f2f40366
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix warning when using QXmlInputSource with non opened QIODevice
Shane Kearns [Thu, 10 Nov 2011 17:16:25 +0000 (17:16 +0000)]
Fix warning when using QXmlInputSource with non opened QIODevice

Calling setTextModeEnabled on a QIODevice that is not open generates
a warning as a result of QTBUG-20905. Previously, it caused incorrect
behaviour when called with true.
Now only call it if the QIODevice passed in is already opened.
If not open, then it is opened by the xml reader without text mode,
so there is no difference in behaviour.

xml autotests still pass, although this removes several QWARN messages
from the qdom autotest.

Task-number: QTBUG-22659
Change-Id: Ie3137e44fe776bff6371ebd008428110168717ec
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoFix parsing of #if defined expression
Olivier Goffart [Thu, 10 Nov 2011 13:56:55 +0000 (14:56 +0100)]
Fix parsing of #if defined expression

We only need to match the closing parentheses if there was an opening one

This has caused mis-parsing of tst_qbytearray.cpp

Change-Id: I9d52916e3ed8549c5ddd968092451fef7389a952
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoDoc: Added more appropriate links to help reduce confusion.
David Boddie [Thu, 16 Jun 2011 18:20:50 +0000 (20:20 +0200)]
Doc: Added more appropriate links to help reduce confusion.

Task-number: QTBUG-19919
(cherry picked from commit 26c29a2dd7efa4c66063d1255e1f694462cbae85)
(cherry picked from commit 8304ca4edd7bd71dd0398451e62a281eac54d0a6)

Change-Id: Icd45465723f9077f109459df002556be81dddb33
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoRemoved include to qdatastream.h from qmetatype.h
Olivier Goffart [Thu, 10 Nov 2011 10:50:02 +0000 (11:50 +0100)]
Removed include to qdatastream.h from qmetatype.h

Added forward reference to QDataStream instead

In the new connection syntax, I want to include qmetatype.h from qobject.h,
in order to handle metatype for queued connection.
So qdatastream cannot be included here (as it inherit qobject) else it would
lead to circular inclusion.

QDataStream is only used in templated code that is dependent on the
template parametter so it is fine to have it forward declared.

Change-Id: I08ea479f481262a80451a277ee29533c42cb9f89
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoUpdate V8
Aaron Kennedy [Tue, 11 Oct 2011 05:06:25 +0000 (15:06 +1000)]
Update V8

Change-Id: Ic239ef1e55bed06260e4a04cc2199f64c2d30059
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix Q_STATIC_ASSERT on Mac
João Abecasis [Thu, 10 Nov 2011 12:15:22 +0000 (13:15 +0100)]
Fix Q_STATIC_ASSERT on Mac

gcc 4.2.1 complains about the use of C++-style cast in the macro.

    error: template argument 1 is invalid

. Changing the bool-cast to a C-style cast makes the test compile.

Change-Id: Ie9082a3adbfd53147bfd0bfe36dd9e7328e01ee8
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoUpdated Qt::InputMethodQuery documentation
Pekka Vuorela [Thu, 10 Nov 2011 11:05:37 +0000 (13:05 +0200)]
Updated Qt::InputMethodQuery documentation

Change-Id: Ibd27231366e4af2780bfe2f8f735da74dc04a1cf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDocument QInputMethodQueryEvent class
Pekka Vuorela [Wed, 9 Nov 2011 15:22:40 +0000 (17:22 +0200)]
Document QInputMethodQueryEvent class

Change-Id: I6e98f9e690b733a06ee165e5b01ab6a5a784791b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQWidget text editors to commit text on their own on losing focus
Pekka Vuorela [Tue, 8 Nov 2011 16:12:02 +0000 (18:12 +0200)]
QWidget text editors to commit text on their own on losing focus

Change-Id: I3b907661e8a24a6dbdaabf607c5c528b1b471c98
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQTextEdit to use tentative commit instead of QInputPanel::commit()
Pekka Vuorela [Tue, 8 Nov 2011 14:47:10 +0000 (16:47 +0200)]
QTextEdit to use tentative commit instead of QInputPanel::commit()

Latter to be deprecated.

Change-Id: I2c302c73a7ab2f4201af6a3c6fb4a64a4760263e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoImplement partial tentativeCommit support in QTextEdit
Pekka Vuorela [Mon, 7 Nov 2011 09:52:56 +0000 (11:52 +0200)]
Implement partial tentativeCommit support in QTextEdit

Available on plain text for now, html support still pending.

Change-Id: I0818b97874e80c8c1b33a9127aa7bb3330a8761d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdd isDebugBuild() query function to QLibraryInfo
aavit [Thu, 10 Nov 2011 10:05:15 +0000 (11:05 +0100)]
Add isDebugBuild() query function to QLibraryInfo

Also cleaned up the doc, removing references to the buildkey() function
that has been removed.

Change-Id: I2cb403f93d93c0b2f71c8502818d669f7bfbfbec
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoCompile.
Morten Sorvig [Thu, 10 Nov 2011 08:36:34 +0000 (09:36 +0100)]
Compile.

QNSPanel must be a NSPanel and not a QNSWindow
subclass.

Change-Id: I1de31e147757824610f4aabc0ef66ae3906dc0f6
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRe-enabled passing tests in tst_qabstractprintdialog
Jo Asplin [Wed, 9 Nov 2011 16:05:51 +0000 (17:05 +0100)]
Re-enabled passing tests in tst_qabstractprintdialog

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

Task-number: QTBUG-22453
Change-Id: Ic09a03ed405bf6f85917410a7a86e17f2fe22cba
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRe-enabled passing tests in tst_exceptionsafety_objects
Jo Asplin [Wed, 9 Nov 2011 14:55:16 +0000 (15:55 +0100)]
Re-enabled passing tests in tst_exceptionsafety_objects

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

Task-number: QTBUG-22453
Change-Id: If1fbf59c9d941453b9fd7feb43c59e27e087ce50
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoCleanup corelib autotests
Jason McDonald [Mon, 7 Nov 2011 09:19:27 +0000 (19:19 +1000)]
Cleanup corelib autotests

Remove literal tabs.

Change-Id: I210a0259773cceb20d35ebc80b889e3ebb88b540
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove redundant #define
Jason McDonald [Mon, 7 Nov 2011 06:18:17 +0000 (16:18 +1000)]
Remove redundant #define

Change-Id: I27a47653d2c41741f39ee1fea6a1fed063279994
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoPropagate QTest::mouseEvent keyboard modifiers.
Andrew den Exter [Wed, 9 Nov 2011 06:19:54 +0000 (16:19 +1000)]
Propagate QTest::mouseEvent keyboard modifiers.

The QWindowSystemInterface mouse functions now have keyboard
modifiers parameter, make use of them.

Task-number: QTBUG-21743
Change-Id: I65ba1095825b81d575d314c1de2a45cef28e697a
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRemove unused MMX/3DNOW/SSE/SSE2/SSSE3/NEON custom compiler logic
Bradley T. Hughes [Tue, 8 Nov 2011 13:08:19 +0000 (14:08 +0100)]
Remove unused MMX/3DNOW/SSE/SSE2/SSSE3/NEON custom compiler logic

The QtWidgets module doesn't contain any code that needs these custom
compilers (that code has been move to QtGui).

Change-Id: I655e478908bfa0b646e68210f6215d9ffbb1f81e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix build when QEGL_EXTRA_DEBUG is defined for debug output
Johannes Zellner [Wed, 9 Nov 2011 16:49:54 +0000 (17:49 +0100)]
Fix build when QEGL_EXTRA_DEBUG is defined for debug output

Also shift EGL configuration plot above window surface creation

Change-Id: I2de860e087cb2648b6e8e9b75365fbe78fe7687a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agosupport the obj-c #import statement in the dependency generator
Oswald Buddenhagen [Fri, 14 Oct 2011 10:55:28 +0000 (12:55 +0200)]
support the obj-c #import statement in the dependency generator

Task-number: QTBUG-21965
Reviewed-by: joerg
(cherry picked from commit d2c7193107a170e2884db52272f4d0ee0da62856)
Change-Id: I8a5eb47bfd2c2ee9d064f054565915e64e4902f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdopt eglfs platform plugin to changed QEGLPlatformContext API
Johannes Zellner [Wed, 9 Nov 2011 16:39:50 +0000 (17:39 +0100)]
Adopt eglfs platform plugin to changed QEGLPlatformContext API

eglClientVersion is not used anymore

Change-Id: I8595a17386c1466d7766522adbdbd7cd5002ecf8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoCorrectly normalize timevals before calling select()
Bradley T. Hughes [Wed, 9 Nov 2011 15:19:11 +0000 (16:19 +0100)]
Correctly normalize timevals before calling select()

When normalizing timevals, we need to bound the tv_usec member to
0-999999 inclusive, otherwise select() may return EINVAL.

When rounding timevals to the nearest millisecond in the UNIX event
dispatcher, pass the timeval through normalizeTimeval() when returning.

As discovered on Mac OS X with tst_QFutureWatcher, starting a 10 second
timer would end up calling select() with timeval = { 9l, 1000000 },
resulting in numerous "select: Invalid argument" warnings being printed
to the console.

Change-Id: Ic539e935bf847e0d4c22a73ad203e3a7a81d0690
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoQVariant: Fix MSVC compiler warning about unused variable null.
Friedemann Kleint [Wed, 9 Nov 2011 14:58:27 +0000 (15:58 +0100)]
QVariant: Fix MSVC compiler warning about unused variable null.

Use static method isnull().
Introduced by ca26fefc0624264262a2abe630568271cefa2753.

Change-Id: I752f8d8a5ec473dcc5f50fbda47d061b8d3a7e13
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove unnecessary variable self-assignment
Bradley T. Hughes [Tue, 8 Nov 2011 17:01:49 +0000 (18:01 +0100)]
Remove unnecessary variable self-assignment

Assigning an int variable to itself is unnecessary and pointless, remove
them.

styles/qplastiquestyle.cpp:932:23: warning: explicitly assigning a
variable of type 'int' to itself [-Wself-assign]
                width = width;
                ~~~~~ ^ ~~~~~
styles/qplastiquestyle.cpp:939:23: warning: explicitly assigning a
variable of type 'int' to itself [-Wself-assign]
                width = width;
                ~~~~~ ^ ~~~~~

Change-Id: I0118874028bf43992bcce07f87b46b48868436cc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoAssign function argument to class member, not to itself
Bradley T. Hughes [Tue, 8 Nov 2011 17:03:57 +0000 (18:03 +0100)]
Assign function argument to class member, not to itself

The 'worker' function argument shadows the class member of the same
name, and 'worker = worker;' assigns the function argument to itself,
not to the member as intended.

examples/tutorials/threads/movedobject/thread.cpp:69: warning:
explicitly assigning a variable of type 'QObject *' to itself [-Wself-
    worker = worker;
    ~~~~~~ ^ ~~~~~~

Change-Id: If4adf486a86a4ba4e7f7040a7771a70b7dd9aa86
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoUn-internalized QDBusServer
Pekka Vuorela [Tue, 8 Nov 2011 16:34:43 +0000 (18:34 +0200)]
Un-internalized QDBusServer

Was marked internal earlier because of missing implementation. That
should be now in place.

Change-Id: I9005da4455299386556e567847474c8d8b6fd5ea
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemoved obsolete host.pro from qtbase
Jo Asplin [Mon, 7 Nov 2011 12:21:52 +0000 (13:21 +0100)]
Removed obsolete host.pro from qtbase

Note that the uiloader test has been moved
from qtbase to qttools (see QTBUG-19453).

Change-Id: I326fa0da435701eeaad7026160e3203a27cb3666
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoDeleted qtipc autotest from qtbase
Jo Asplin [Tue, 8 Nov 2011 12:19:16 +0000 (13:19 +0100)]
Deleted qtipc autotest from qtbase

The qtipc autotest needs to live in qtscript due to dependencies
to that module. This commit is the first of two steps to move qtipc.
The second step is a commit in qtscript that adds qtipc there
(with a proper reference to the first commit, i.e. this one).

Change-Id: I233ee459be76fd1938868c05232ce732cfc913a8
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFixed typo: private-tests -> private_tests
Jo Asplin [Tue, 8 Nov 2011 13:04:31 +0000 (14:04 +0100)]
Fixed typo: private-tests -> private_tests

Change-Id: I8bc53061a6b7a8605290dca0d90e67d7660b4c33
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRe-enabled passing tests in tst_qopengl
Jo Asplin [Tue, 8 Nov 2011 15:03:37 +0000 (16:03 +0100)]
Re-enabled passing tests in tst_qopengl

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

Task-number: QTBUG-22453
Change-Id: Ifa9ccab81efb1577767465c150fc64a9d9e3f8e0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoCocoa: Implement mouse and keyboard grab.
Morten Sorvig [Wed, 9 Nov 2011 09:35:11 +0000 (10:35 +0100)]
Cocoa: Implement mouse and keyboard grab.

Change-Id: Id53ff19d43213d79aaf8f1a6617a06ef9d0cfb4b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoWidgets: Remove dialog functionality from QGuiPlatformPlugin.
Friedemann Kleint [Tue, 8 Nov 2011 14:08:48 +0000 (15:08 +0100)]
Widgets: Remove dialog functionality from QGuiPlatformPlugin.

(as QGuiPlatformPlugin is deprecated)
Clean up qdialog.cpp.

Acked-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Change-Id: Id49d6cfe235d5afb4c89b0697c6b3980130a5299
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years ago[optimization] QVariants comparison
Jędrzej Nowacki [Mon, 31 Oct 2011 09:22:46 +0000 (10:22 +0100)]
[optimization] QVariants comparison

QMetaType::isRegistered and QMetaType::typeName are quite expensive.
To compare two custom objects we need to have their type name (for
dereferenced comparison). If the name exist we know for sure that the
type is registered and we do not have to call QMetaType::isRegistered
anymore.

Change-Id: Iba631e012504c8633868a902880fa30d38afb917
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoAdd QPolygonF to metatype system.
Jędrzej Nowacki [Wed, 26 Oct 2011 11:48:40 +0000 (13:48 +0200)]
Add QPolygonF to metatype system.

That was strange that QPolygon was know to QMetaType class but QPolygonF
not.

Change-Id: I67bb99644b8b1d0fe1aec730619d8048cb78219b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMake usage of internal QVariant space.
Jędrzej Nowacki [Wed, 12 Oct 2011 15:32:26 +0000 (17:32 +0200)]
Make usage of internal QVariant space.

Each QVariant instance has internal storage which may be
used for well-know basic types. This patch changes the
behavior by delegating type dependent operation to QMetaType
class which knows more types than QVariant itself.

The patch significantly reduce amount of code in QVariant
implementation.

There are few side effects of this patch:
- better performance:
* for Core types when using Gui (QGuiVariant is able to
construct Core types)
* for small custom types (QVariant::Private::Data is used for all
types that has size small enough)
- comparing two QVariants can give different result for small custom
types (binary comparison instead of pointer comparison)

Change-Id: Ic17fa500d6a882110bfba896fd456c8e6c7a63a9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>