profile/ivi/qtbase.git
12 years agoFix compilation on Harmattan
Simon Hausmann [Thu, 13 Sep 2012 10:52:49 +0000 (12:52 +0200)]
Fix compilation on Harmattan

The GLES2 libraries on Harmattan do not provide a typedef for GLChar.  Work
around it here by adding it. The Kkronos headers specify GLChar as a typedef to
char, so if an implementation already provides it, then this doesn't do any
harm.

Change-Id: I0848b72b81fcc602dc8d9eecefdacb5436163040
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agotests: Don't omit the body of a test function with QT_BUILD_INTERNAL
Sergio Ahumada [Tue, 4 Sep 2012 10:40:16 +0000 (12:40 +0200)]
tests: Don't omit the body of a test function with QT_BUILD_INTERNAL

Changing it outside of the test function definition to avoid running
empty/inapplicable test functions.

Change-Id: I713560cde7f715696984ed082d682900f5f1bcdd
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
12 years agoMove QRecursiveMutexPrivate to qmutex.cpp and mark inline
Thiago Macieira [Thu, 16 Aug 2012 14:12:07 +0000 (16:12 +0200)]
Move QRecursiveMutexPrivate to qmutex.cpp and mark inline

Disassembly of the optimised code shows that the compiler was already
inlining the bodies of one or both functions (since they're in the same
.cpp, it's allowed to do that).

However, since there was no "inline" marker, the compiler was also
emitting an out-of-line copy, which wasn't used by anyone, as the class
is not exported.

So add the marker. To make sure that they don't get used by accident
elsewhere, the class is moved to the .cpp file too.

Change-Id: Iead578ec9c7d8dd6b4e6bb582ce5b829cdec5992
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
12 years agoRemove QBasicAtomic::tryLock with a timer
Thiago Macieira [Sat, 11 Aug 2012 16:18:27 +0000 (18:18 +0200)]
Remove QBasicAtomic::tryLock with a timer

The non-futex implementation does not support timed locks in
QBasicMutex. That is only supported in QMutex (due to the
destructor).

Change-Id: I46d33a66a36e05c8a4344823537178e80a6ddd76
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years ago#include the qmutex_xxx.cpp at the end of qmutex.cpp
Thiago Macieira [Sat, 11 Aug 2012 14:28:53 +0000 (16:28 +0200)]
#include the qmutex_xxx.cpp at the end of qmutex.cpp

This produces slightly better inlining results.

Change-Id: Ie86471577f888cb2d9c9989306ec69ce0a296108
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoUse storeRelease to unlock a mutex instead of fetchAndStoreRelease
Thiago Macieira [Sat, 11 Aug 2012 13:23:56 +0000 (15:23 +0200)]
Use storeRelease to unlock a mutex instead of fetchAndStoreRelease

We're not checking the result anyway, so use a simpler operation.

Change-Id: I8c2db35be86660b29d81dd97ce3e269de55a37df
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoAvoid calling QElapsedTimer::nsecsElapsed before the first futex sleep
Thiago Macieira [Sat, 11 Aug 2012 14:03:51 +0000 (16:03 +0200)]
Avoid calling QElapsedTimer::nsecsElapsed before the first futex sleep

The first time we're going to sleep, the timeout should be exactly the
value that was passed by the user. We don't need to calculate the time
elapsed between start() and a few lines below.

Change-Id: I99c363b6f0ecfd07ad787b79b75e61771733c2b3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoSplit the timed mutex lock from the non-timed lock functions
Thiago Macieira [Sat, 11 Aug 2012 10:18:45 +0000 (12:18 +0200)]
Split the timed mutex lock from the non-timed lock functions

Non-timed mutex locks are by far more common, so let's try not to
penalise the locking of those with code that won't get used that
often.

Change-Id: I37f56d6429836467fdec2e588c0fb22d914b5d75
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoSimplify the futex lock loop: no need for nested while
Thiago Macieira [Sat, 11 Aug 2012 12:47:10 +0000 (14:47 +0200)]
Simplify the futex lock loop: no need for nested while

Once we enter the inner loop, we never exit it except to return from
the lockInternal() function, so the rest is never executed again.

As a consequence of this, we won't try to fastTryLock() twice per
mutex. Therefore, for a non-recursive mutex, if lockInternal() is
entered, we'll definitely need to use futexes.

Change-Id: Ice617ed27449c1fbdc112a159a86cd0660125e13
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMake QBasicMutex be exclusively non-recursive
Thiago Macieira [Sat, 11 Aug 2012 14:45:14 +0000 (16:45 +0200)]
Make QBasicMutex be exclusively non-recursive

Dispatch to the recursive mutex functions from QMutex::lock, tryLock
and unlock.

This has the benefit that those using QBasicMutex will not go through
the testing for recursive mutexes. It simplifies a little the code for
those users.

For the users of QMutex, the code required to perform a lock does not
appear to change.

Change-Id: I0ca9965e012b283c30f1fab8e9f6d9b3288c2247
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't recheck about timeout == 0 during mutex locking
Thiago Macieira [Sat, 11 Aug 2012 12:08:39 +0000 (14:08 +0200)]
Don't recheck about timeout == 0 during mutex locking

If the timeout wasn't zero, it can only become zero if we return from
futex() with a non-timeout reason but subsequently expires while we're
recalculating something.

A side effect is that we try-lock a non-recursive mutex exactly
once. Before this change, we'd fastTryLock() twice even with
timeout == 0.

Change-Id: I0af09fc2a84669a683a843fcf1513203b075dfb7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
12 years agoHoist the recursive mutex check out of the inner loop
Thiago Macieira [Sat, 11 Aug 2012 11:51:26 +0000 (13:51 +0200)]
Hoist the recursive mutex check out of the inner loop

A non-recursive mutex doesn't suddenly become recursive, so we don't
need to check it multiple times.

Change-Id: Id040254b6142d320a7bd3111491082ad09968404
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoQtDBus: added missing QT_NO_DBUS guards
J-P Nurmi [Wed, 12 Sep 2012 12:00:49 +0000 (14:00 +0200)]
QtDBus: added missing QT_NO_DBUS guards

Change-Id: If3bbba7765a4949e5a7aefca063dc56c21c06687
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix QDBusServer with more than one connection
Jan Arne Petersen [Fri, 23 Mar 2012 12:58:04 +0000 (13:58 +0100)]
Fix QDBusServer with more than one connection

Create a new QDBusConnectionPrivate for every new connection in
qDBusNewConnection instead of creating a single QDBusConnectionPrivate
in the QDBusServer constructor which gets assigned the latest connected
DBusConnection in qDBusNewConnection (and loses track on all previous
DBusConnections).

Also extend tst_QDBusConnection::registerObjectPeer() test with multiple
connections to the server.

Task-Number: 24921
Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd qdbusconnectionmanager_p.h to the HEADER list.
Thiago Macieira [Wed, 12 Sep 2012 12:33:14 +0000 (14:33 +0200)]
Add qdbusconnectionmanager_p.h to the HEADER list.

Change-Id: Iacba510beb0ee72182931e97044eaa5b46df30af
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
12 years agothrow() is C++, so don't use it in C mode
Thiago Macieira [Wed, 12 Sep 2012 13:20:06 +0000 (15:20 +0200)]
throw() is C++, so don't use it in C mode

Q_DECL_NOTHROW is used by qVersion(), which can be extern "C".

Change-Id: If71f3bc3a0df3e8321237e5ac9f3bea82380c1e4
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoconfig.tests/arch: make distclean on the test, not qt
Mark Brand [Thu, 13 Sep 2012 21:46:41 +0000 (23:46 +0200)]
config.tests/arch: make distclean on the test, not qt

Additionally, qmake no longer needs -o since we are in the project
directory.

Change-Id: I89dbe829c064663b653e8f747f0849d63ceb367e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoUse QElapsedTimer instead of QTime to measure elapsed time
Thiago Macieira [Wed, 12 Sep 2012 12:56:06 +0000 (14:56 +0200)]
Use QElapsedTimer instead of QTime to measure elapsed time

QElaspedTimer is a lot more efficient.

Change-Id: I66d9514108f800a45181d8960b01a5e7d3fa9e80
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoIncrease the fuzziness of the QSemaphore test to 50 ms
Thiago Macieira [Wed, 12 Sep 2012 12:55:09 +0000 (14:55 +0200)]
Increase the fuzziness of the QSemaphore test to 50 ms

The test tries to acquire a semaphore that isn't ready, so it will
timeout. The test is working properly.

The only problem is that 10 ms is too strict. For a wide variety of
reasons, especially since the Qt CI system runs multiple tests in
parallel, the program may not run again in that 10 ms window.

Change-Id: Ic0f684895f73646db5f1cc783fe9ef75fb1ab02b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFixed: QFileInfo::lastModified() returning wrong value.
Markku Heikkila [Tue, 5 Jun 2012 12:50:13 +0000 (15:50 +0300)]
Fixed: QFileInfo::lastModified() returning wrong value.

Fixed so that empty QDateTime is returned for non existing file.
Fixed also created() and lastRead() to return empty QDateTime for
non existing file.

QFileSystemEngine::fillMetaData() returned true for non existing
files. This was also corrected.

Task-number: QTBUG-25811

Change-Id: I523eb99e4405b4b813b2950f85cc646239181d07
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Christian Stromme <christian.stromme@nokia.com>
12 years agoDoc: Marked the QUrlInfo class documentation as \internal
Venugopal Shivashankar [Thu, 13 Sep 2012 11:38:38 +0000 (13:38 +0200)]
Doc: Marked the QUrlInfo class documentation as \internal

Change-Id: Ib84c9ffc181edf17850d5334c95c035428d31b6c
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoTest: Redo remove QSKIP from printsupport tests
Caroline Chao [Fri, 7 Sep 2012 12:59:15 +0000 (14:59 +0200)]
Test: Redo remove QSKIP from printsupport tests

Redoing 5704cbc462ad0b316a6b55a0f1dadc3c50762ef

This can't work, because the define comes from qconfig.h, not qmake.

Skipping initTestCase and cleanupTestCase when QT_NO_PRINTER is
defined.

Change-Id: I2527c018294b7518a4692f2c93da933848640b5d
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agoFix QAbstractItemModel documentation errors.
Mitch Curtis [Wed, 12 Sep 2012 11:59:55 +0000 (13:59 +0200)]
Fix QAbstractItemModel documentation errors.

Added a dependency on the qtwidgets module to qtcore.qdocconf so that
it has access to widgets examples. Also added examples/widgets to
exampledirs.

Change-Id: I7a69f51d51b65bd534950f0df5b348d6ef61a5d9
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoDoc: Fix snippet bug in Getting Started Qt
Geir Vattekar [Wed, 12 Sep 2012 10:07:45 +0000 (12:07 +0200)]
Doc: Fix snippet bug in Getting Started Qt

Change-Id: I9c8caabee4c6f6131a69851586ef992138beb211
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoFix QPrinter documentation errors.
Mitch Curtis [Thu, 13 Sep 2012 08:06:21 +0000 (10:06 +0200)]
Fix QPrinter documentation errors.

Removed documentation for non-existent functions and added
external-resources.qdoc.

Change-Id: I5159540d8304dd6e2e452be11404d40fc599a2a7
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoFix qtestlib-manual.qdoc errors.
Mitch Curtis [Thu, 13 Sep 2012 08:44:01 +0000 (10:44 +0200)]
Fix qtestlib-manual.qdoc errors.

Corrected paths to tutorials and added qt-webpages.qdoc for missing
links.

Change-Id: I1c318f2f80804b73941acfcb5a53df456108f018
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoRemove documentation for non-existent QToolButton functions.
Mitch Curtis [Wed, 12 Sep 2012 14:31:08 +0000 (16:31 +0200)]
Remove documentation for non-existent QToolButton functions.

Change-Id: If453b181c53bc0b80ec9ba7745d24399520bbc4b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoRemove documentation for non-existent QToolBox functions.
Mitch Curtis [Wed, 12 Sep 2012 14:16:21 +0000 (16:16 +0200)]
Remove documentation for non-existent QToolBox functions.

Change-Id: I185e70f2e5183b02ce2c487991ac98aafc990bfb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoDocs: Add "\since" info for QEventLoopLocker.
Christian Kandeler [Tue, 11 Sep 2012 10:34:43 +0000 (12:34 +0200)]
Docs: Add "\since" info for QEventLoopLocker.

Change-Id: Ie749b6f2539be5bd08d7a6a00eb4e8655cec1227
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQt 5 API should correspond to Qt 4.8 on Windows, not 4.9.
Stephen Kelly [Wed, 12 Sep 2012 15:51:35 +0000 (17:51 +0200)]
Qt 5 API should correspond to Qt 4.8 on Windows, not 4.9.

Change-Id: I052e76b4dcf0765d142567f748022d652072075c
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove documentation for non-existent QTextEdit functions.
Mitch Curtis [Wed, 12 Sep 2012 14:07:52 +0000 (16:07 +0200)]
Remove documentation for non-existent QTextEdit functions.

Change-Id: I92b67e676c78c641bfefc636efada22254e0bca3
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoFix QByteArray documentation errors.
Mitch Curtis [Wed, 12 Sep 2012 11:33:51 +0000 (13:33 +0200)]
Fix QByteArray documentation errors.

Add missing external resource link. Provide constructor documentation.

Change-Id: I6d28a19da5c409dd0e0b48e0f693837b63de38f0
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoBlackberry: fix tst_QFileInfo::isWritable()
Rafael Roquetto [Thu, 13 Sep 2012 14:29:47 +0000 (11:29 -0300)]
Blackberry: fix tst_QFileInfo::isWritable()

This test checks the access permissions for '/etc/passwd', however the
filesystem on Blackberry is always read-only

Change-Id: I9299531397d4467287541b04184540ad6e2eae72
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoAdd QMAKE_CXXFLAGS_CXX11 & QMAKE_LFLAGS_CXX11 flags of win32-g++
Yuchen Deng [Sun, 19 Aug 2012 08:10:07 +0000 (16:10 +0800)]
Add QMAKE_CXXFLAGS_CXX11 & QMAKE_LFLAGS_CXX11 flags of win32-g++

Change-Id: I752c37b581af6d5ea171ec99ef0afe29ffa78002
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix compilation for win32-g++ and C++11
Kai Koehne [Wed, 5 Sep 2012 14:10:47 +0000 (16:10 +0200)]
Fix compilation for win32-g++ and C++11

gcc defines __STRICT_ANSI__ implicitly for -std=c++0x. The MinGW headers
however omit the declaration of common functions like putenv then.

Instead of working around this MinGW particularity on a case by case basis, rather
just use gnu++0x for QtCore.

Change-Id: Iefe4e7f77014a4f1d501b149e34f7049deb52fb9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd c++11 option to configure.exe
Kai Koehne [Wed, 5 Sep 2012 08:31:49 +0000 (10:31 +0200)]
Add c++11 option to configure.exe

Also check for c++11 support in configure.exe (which is also used by MinGW builds).
The c++11 check is therefore moved from 'unix' to 'common' directory.

Change-Id: I082848f032c2770e52e34f331b83820f395c06b6
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoNetwork: Fix gcc warning about conversion from string to wchar *
Kai Koehne [Wed, 12 Sep 2012 14:03:50 +0000 (16:03 +0200)]
Network: Fix gcc warning about conversion from string to wchar *

Fix gcc 4.7 warning:
'deprecated conversion from string constant to 'SEC_WCHAR*'

Change-Id: I5df44ffdc0d505789f99b58d68e02b7535ce761b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoKernel: Fix gcc warning in qsharedmemory_win.cpp
Kai Koehne [Wed, 12 Sep 2012 13:43:09 +0000 (15:43 +0200)]
Kernel: Fix gcc warning in qsharedmemory_win.cpp

Fix gcc 4.7 'arning: converting 'false' to pointer type 'HANDLE {aka void*}' [-Wconversion-null]'

Change-Id: I28d890d5fd4975517a9329d68c9ef73f6fadf36c
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoKernel: Fix gcc warning about narrowing conversion
Kai Koehne [Wed, 12 Sep 2012 13:35:31 +0000 (15:35 +0200)]
Kernel: Fix gcc warning about narrowing conversion

Fix gcc 4.7.1 warning: 'narrowing conversion of 'value' from 'int' to
'uint {aka unsigned int}' inside { } is ill-formed in C++11 '

Change-Id: I64ee1a35ecd60cc6a5d7d024c5f903078b3d4f60
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoThreads: Fix mingw-gcc warning about 'cast to pointer from integer of different size'
Kai Koehne [Wed, 12 Sep 2012 13:30:59 +0000 (15:30 +0200)]
Threads: Fix mingw-gcc warning about 'cast to pointer from integer of different size'

Use reinterpret_cast to convert from DWORD to pointer.

Change-Id: I17a12940850aeb0bc27080725a18eb93fee72ff7
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoImprove QMetaType docs.
Jędrzej Nowacki [Tue, 11 Sep 2012 13:55:08 +0000 (15:55 +0200)]
Improve QMetaType docs.

Change-Id: I4ad4188d1bb984b83ffe4bb4ff098158e888d183
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoFix crash when invalidating a QSortFilterProxyModel
Stephen Kelly [Thu, 13 Sep 2012 13:23:15 +0000 (15:23 +0200)]
Fix crash when invalidating a QSortFilterProxyModel

Task-number: QTBUG-27122

Change-Id: Ibca46b88442f4f92422d9b3182e4bbf25716a07f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agounscramble option help text
Mark Brand [Thu, 13 Sep 2012 13:54:11 +0000 (15:54 +0200)]
unscramble option help text

Change-Id: I1e38aced5c3188c4db470e26fa117b0dd08bf100
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoremove support for non-lowercased $$eXpaNd() functions
Oswald Buddenhagen [Mon, 3 Sep 2012 15:08:56 +0000 (17:08 +0200)]
remove support for non-lowercased $$eXpaNd() functions

we have been warning about such functions for a while now, now execute.
the qmake language is (generally) case-sensitive, so this wasn't all
that useful anyway.

Change-Id: I1388ac2d5a1104389aeb3347e739a0d5e69e138d
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agodelete grossly outdate changelog file
Oswald Buddenhagen [Wed, 12 Sep 2012 17:29:17 +0000 (19:29 +0200)]
delete grossly outdate changelog file

Change-Id: Ibd35690e82849457a10d8d2f99564d2e0bde257b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agobump qmake version
Oswald Buddenhagen [Wed, 12 Sep 2012 17:27:42 +0000 (19:27 +0200)]
bump qmake version

the world has awaited this moment for a long time. very patiently.

Change-Id: Iba8697e7eebb5cdd43caadb64cd89126de395e66
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoreplace qmake_version() with a simple string literal
Oswald Buddenhagen [Wed, 12 Sep 2012 17:27:09 +0000 (19:27 +0200)]
replace qmake_version() with a simple string literal

Change-Id: I12e715aab23e01267e8a1434a3a965276c1a6182
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agodon't pretend that break()/next()/return() are functions
Oswald Buddenhagen [Tue, 11 Sep 2012 17:30:29 +0000 (19:30 +0200)]
don't pretend that break()/next()/return() are functions

it's a pretty braindead thing to implement control flow statements as
(built-in) functions.

as a "side effect", this fixes return() value handling for lists.

(cherry picked from qtcreator/f53ed6c4b3feca59a94d4f0de8b1a7411122e30e)
(cherry picked from qtcreator/f529e22ec38fb9a656d74394e484d2453cf42c69)
Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoimprove parse error recovery paths
Oswald Buddenhagen [Tue, 11 Sep 2012 16:43:29 +0000 (18:43 +0200)]
improve parse error recovery paths

to reduce collateral damage from parse errors.

(cherry picked from qtcreator/00c0d0d5e42d28e03c2846c17d3acbcd8420859d)
Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRemove documentation for non-existent QLineEdit functions.
Mitch Curtis [Wed, 12 Sep 2012 13:44:22 +0000 (15:44 +0200)]
Remove documentation for non-existent QLineEdit functions.

Several functions in qlineedit.cpp are documented but don't exist. QDoc
was complaining... e.g.: "Cannot find 'repaintArea(...)' in '\fn' void
QLineEdit::repaintArea(int a, int b)".

Change-Id: I56ca0dbc8e7b4da5f23ad2ca8d8280cdf91c2dc2
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
12 years agoFix regression in QTextDocument::toHtml() with font pixel size
Eskil Abrahamsen Blomfeldt [Wed, 12 Sep 2012 10:13:35 +0000 (12:13 +0200)]
Fix regression in QTextDocument::toHtml() with font pixel size

Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
missing a attributesEmitted=true which caused the output from
toHtml() to sometimes be invalid when using pixel sizes to
specify the font size.

Task-number: QTBUG-25778
Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
12 years agoFix build with QT_NO_EXCEPTIONS
Harald Fernengel [Wed, 12 Sep 2012 12:27:18 +0000 (14:27 +0200)]
Fix build with QT_NO_EXCEPTIONS

qTerminate is declared within a #ifndef QT_NO_EXCEPTIONS block, so the
implementation must use the same #ifdef

Change-Id: I5d2d58a55fce5084c0538d18a9dd3998b12ed703
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Arvid Picciani <aep@exys.org>
12 years agoAdd configure -help output for the ICU option.
Thiago Macieira [Mon, 10 Sep 2012 15:39:44 +0000 (17:39 +0200)]
Add configure -help output for the ICU option.

Change-Id: I922d3fd4d3c2d9e8e844dfb661a91934e4b05aea
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoTest: Update QSKIP for tst_QGLThread on Mac
Caroline Chao [Wed, 5 Sep 2012 12:38:18 +0000 (14:38 +0200)]
Test: Update QSKIP for tst_QGLThread on Mac

Task-number: QTBUG-22361
Change-Id: I6182a37dc38294011fd3b3934317f22c7297a4ca
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoPartial revert "cross compile with mingw": unbreak pkg-config
Mark Brand [Wed, 12 Sep 2012 07:01:45 +0000 (09:01 +0200)]
Partial revert "cross compile with mingw": unbreak pkg-config

This partially reverts commit
07a978d3d4b41739eff1061dc45dbfa737bf78b9.

Despite what the commit message said, pkg-config previously worked
and was useful, particularly for static Qt. Qt itself even installs
its own .pc files.

Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid
using the pkg-config installation on the build machine.

Change-Id: Ia4a8d18cd57f74a00bdb9b6a171d20151978a9cc
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoqpa: extend drawPixmap capabilities
Julien Brianceau [Tue, 11 Sep 2012 15:20:30 +0000 (17:20 +0200)]
qpa: extend drawPixmap capabilities

Extend drawPixmap capabilities for qpa through new ExtendedPixmapCapability
QBlittable flag and add related implementation in DirectFB platform.

Change-Id: If5436e16bfb37bf081bf864cad73a5e97394df8c
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoCocoaPlugin: add missing auto release pools
Richard Moe Gustavsen [Thu, 6 Sep 2012 10:20:34 +0000 (12:20 +0200)]
CocoaPlugin: add missing auto release pools

Add auto release pools to the entry functions of the plugin
that leads to mem leaks. By adding them as early as possible
in the callstack, we avoid creating to many pools

Change-Id: I715e06bd8d3280c6877340fc724eb1afbf804ae1
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoDoc: Fix misc. doc errors and document undocumented functions
aavit [Tue, 11 Sep 2012 09:37:06 +0000 (11:37 +0200)]
Doc: Fix misc. doc errors and document undocumented functions

Change-Id: I0c1e0a36ee37d5a8f3741f0405f63f9b26967f32
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoTest: remove QSKIP from printsupport tests
Caroline Chao [Fri, 7 Sep 2012 12:59:15 +0000 (14:59 +0200)]
Test: remove QSKIP from printsupport tests

Exclude printsupport tests from the build when QT_NO_PRINTER is
defined.

Change-Id: Iedae91666a599f4b77250abc8aac14c256fde34e
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoStabilize qprinter test
Eskil Abrahamsen Blomfeldt [Mon, 10 Sep 2012 13:05:28 +0000 (15:05 +0200)]
Stabilize qprinter test

The CreationDate entry in the two PDF files can potentially
be different depending on when the test is run. We ignore the
line for this entry when comparing the two results.

Task-number: QTBUG-27171
Change-Id: I8978678295217edd537edb0d2c25260813aa3d93
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoDon't manipulate immutable data
João Abecasis [Fri, 24 Aug 2012 08:53:58 +0000 (10:53 +0200)]
Don't manipulate immutable data

QArrayData can point to data it does not own (cf. fromRawData()), which
shouldn't be modified. Not even upon destruction, as this data can live
in Read-Only memory or be otherwise shared outside the QArrayData realm.

Change-Id: I8bdf3050a17802fb003b77d5f543fe31769a7710
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andreas Hartmetz <ahartmetz@gmail.com>
12 years agoQFileSystemEngine: fix realpath() buffer size
Rafael Roquetto [Tue, 11 Sep 2012 12:58:32 +0000 (09:58 -0300)]
QFileSystemEngine: fix realpath() buffer size

realpath() returns at most PATH_MAX _plus_ the terminator.

Change-Id: I4c2e3e166a5f476863ad8c6999800e6468535dbe
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoQNX: fix call to realpath() on QFileSystemEngine
Rafael Roquetto [Tue, 11 Sep 2012 12:45:20 +0000 (09:45 -0300)]
QNX: fix call to realpath() on QFileSystemEngine

QNX6, as opposed to later QNX versions, does not define the behavior of
realpath() when the second parameter is NULL. We leave it then for the
compiler to decide which implementation to call, by relying on the _POSIX_VERSION_
macro, which in QNX6 happens to evaluate to < 200801L.

Change-Id: I3a6d3859858f56b69f0d391384c2703083a01257
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agodon't require (dummy) qconfig.h for qmake build
Oswald Buddenhagen [Tue, 11 Sep 2012 13:22:29 +0000 (15:22 +0200)]
don't require (dummy) qconfig.h for qmake build

Change-Id: I22a2c9aa1366ff858b3bb646617543968c810136
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agocall syncqt before building qmake
Oswald Buddenhagen [Tue, 11 Sep 2012 13:08:48 +0000 (15:08 +0200)]
call syncqt before building qmake

otherwise non-developer builds (which don't have it run by the configure
bootstrap) don't work.

Change-Id: Ide49c0d1646b22687d16366530b246c3754926eb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove setcepaths.bat
Oswald Buddenhagen [Tue, 11 Sep 2012 12:56:49 +0000 (14:56 +0200)]
remove setcepaths.bat

we don't need it any more, as the makefiles are self-contained now.

Change-Id: I1a560a8331856e246e03c55ec1b1dd1a5cb112e4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoqtmodule-configtests is no more, so don't shadow it
Oswald Buddenhagen [Tue, 11 Sep 2012 12:56:03 +0000 (14:56 +0200)]
qtmodule-configtests is no more, so don't shadow it

Change-Id: I0cb51cb63feb09f188764ace7d7b817ca10dd169
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agointroduce -minimal mode to syncqt and use it for bootstrapping
Oswald Buddenhagen [Fri, 31 Aug 2012 14:33:33 +0000 (16:33 +0200)]
introduce -minimal mode to syncqt and use it for bootstrapping

the bootstrap does not need CamelCase includes, deprecated headers and
whatnot, so just don't do it. the full thing will be run on qtbase by
qmake.

Change-Id: Idffdd4750a73574c8c32ee75d00080abfe37e03c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agocompile without CamelCase headers
Oswald Buddenhagen [Fri, 31 Aug 2012 16:30:23 +0000 (18:30 +0200)]
compile without CamelCase headers

for faster bootstrapping without a full syncqt run

Change-Id: I648f0a8fb09be021590c46e8e5e15667a316c817
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoSeveral modifications in phrasing.
Nico Vertriest [Fri, 31 Aug 2012 13:17:16 +0000 (15:17 +0200)]
Several modifications in phrasing.

Corrections of syntactic and spelling errors.

Change-Id: I9d880b4d3f33ace53815d734f99d0b0396497158
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
12 years agoDoc: Remove references to the deprecated QGraphicsItemAnimation
Geir Vattekar [Fri, 7 Sep 2012 14:04:28 +0000 (16:04 +0200)]
Doc: Remove references to the deprecated QGraphicsItemAnimation

Task-number: QTBUG-23711
Change-Id: I1c1ce049016d0bea03d43631493ed8d248162eee
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Jason Barron <jason.barron@nokia.com>
12 years agoClose popups when switching applications on Windows.
Friedemann Kleint [Fri, 7 Sep 2012 11:42:02 +0000 (13:42 +0200)]
Close popups when switching applications on Windows.

Bring back code from 4.8 (Note that ALT-TAB is not received
as key event).

Task-number: QTBUG-27146
Change-Id: I6dd2e9c88fdc4c89d26dfaa8ab47deb2be451f25
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoqpa: add non-opaque fill support
Julien Brianceau [Mon, 10 Sep 2012 13:02:23 +0000 (15:02 +0200)]
qpa: add non-opaque fill support

Add non-opaque fill support for qpa through new QBlittable flag
"AlphaFillRectCapability" and add related implementation in DirectFB
qpa platform.

Change-Id: I863a270e24c96c432489099a34dc1f3a2be52280
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoUpdate iOS 'clang' mkspec for Xcode 4.5
Ian Dean [Wed, 18 Jul 2012 18:40:37 +0000 (11:40 -0700)]
Update iOS 'clang' mkspec for Xcode 4.5

Change-Id: If472bd60fa8ddc9d3af394a904a52290a1c308b6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoQtPrintSupport: set QPrinter margins also to QPagedPaintDevice
Teemu Katajisto [Tue, 12 Jun 2012 11:54:46 +0000 (14:54 +0300)]
QtPrintSupport: set QPrinter margins also to QPagedPaintDevice

QPagedPaintDevice::setMargins() is virtual method and reimplemented in
QPrinter but super class margins were not set in reimplemented method.

This fixes problem where QTextDocument::print() checked the margins
using QPagedPaintDevice::margins() and overrided the margins set
in QPrinter::setMargins().

Change-Id: I3bdcc33b8f6b5a9cbcb04a21484fdd1612dd7d58
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoAdded link to the OpenGL window example from the QOpenGLContext docs.
Samuel Rødal [Thu, 30 Aug 2012 11:59:14 +0000 (13:59 +0200)]
Added link to the OpenGL window example from the QOpenGLContext docs.

Change-Id: I650c61422485dfcb2fcc661a839294aa98b18e80
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoAdd links to raster and opengl window examples in the QWindow docs.
Samuel Rødal [Thu, 30 Aug 2012 12:07:59 +0000 (14:07 +0200)]
Add links to raster and opengl window examples in the QWindow docs.

Change-Id: I4d4ddffd6b8aa682b516b55ed2c5e71585d83bcf
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoImproved the QBackingStore documentation.
Samuel Rødal [Thu, 30 Aug 2012 10:43:45 +0000 (12:43 +0200)]
Improved the QBackingStore documentation.

Added links to the example and added some explanation of when
QBackingStore might be useful.

Change-Id: Iee19c4fdfc5c27ac9b559c9df428d83d302f3928
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoRemoved some unused #defines from iOS qplatformdefs.h
Ian Dean [Thu, 19 Jul 2012 07:36:33 +0000 (00:36 -0700)]
Removed some unused #defines from iOS qplatformdefs.h

Removed QT_GUI_DRAG_DISTANCE & QT_GUI_DOUBLE_CLICK_DISTANCE from the
iOS qplatformdefs.h header as these values are dependant on display
pitch and should be calculated by the platform plugin.

Change-Id: I00c377483ad73cad19a2fe729cb3f45e9271e3ac
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix example includes for qdoc.
Frederik Gladhorn [Wed, 5 Sep 2012 14:53:23 +0000 (16:53 +0200)]
Fix example includes for qdoc.

Change-Id: Ifa6a99db27ce51529489bf077a839a3107b524d2
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoRemove unused file.
Frederik Gladhorn [Wed, 5 Sep 2012 14:26:05 +0000 (16:26 +0200)]
Remove unused file.

Change-Id: I402f1d3216129d693a4b0d33e015fd047c7d2298
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoOutput absolute paths in qdoc messages.
Frederik Gladhorn [Wed, 5 Sep 2012 13:58:32 +0000 (15:58 +0200)]
Output absolute paths in qdoc messages.

Change-Id: I4499bb0464cca3703026e317e940612091bf55a2
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoFix qdoc tag.
Frederik Gladhorn [Wed, 5 Sep 2012 14:05:46 +0000 (16:05 +0200)]
Fix qdoc tag.

Change-Id: I683ee205945f4b3febff6ba9ec9e419a017f24b6
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoMove gui example doc example images.
Frederik Gladhorn [Fri, 31 Aug 2012 12:34:13 +0000 (14:34 +0200)]
Move gui example doc example images.

Change-Id: I01e0c3d51bcb01c66a3f6c7b2ba95f0c9999f4cb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoDo not include /examples in qdocconfs.
Frederik Gladhorn [Tue, 28 Aug 2012 11:20:09 +0000 (13:20 +0200)]
Do not include /examples in qdocconfs.

Change-Id: I84a925a8be4964fae667f5a2500157283a8057d2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoAdd TableModelChange event for accessibility.
Frederik Gladhorn [Thu, 23 Aug 2012 13:27:44 +0000 (15:27 +0200)]
Add TableModelChange event for accessibility.

Change-Id: I4ff892c076b516cee0f6605705854ee8828d4363
Reviewed-by: José Millán Soto <fid@gpul.org>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoRemove deprecated inputItem and inputWindow from QInputMethod
Pekka Vuorela [Mon, 3 Sep 2012 21:32:29 +0000 (00:32 +0300)]
Remove deprecated inputItem and inputWindow from QInputMethod

Interfaces introduced and deprecated during Qt5 development.

Change-Id: I804a02df8c4a03ed6558f4a86375f97d09513d5c
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDoc: Centralize more common settings in 1 global qdocconf.
Casper van Donderen [Mon, 3 Sep 2012 08:55:21 +0000 (10:55 +0200)]
Doc: Centralize more common settings in 1 global qdocconf.

All qdocconf settings that should be used by all Qt modules are now in
qt-module-defaults.qdocconf.

Change-Id: I2a0315a55db3fcbb0160c4392d2da98611043d83
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAvoid duplicate setPen() in PDF when reusing QPrinter
Eskil Abrahamsen Blomfeldt [Mon, 10 Sep 2012 12:10:41 +0000 (14:10 +0200)]
Avoid duplicate setPen() in PDF when reusing QPrinter

The simplePen property was not reset when reusing the QPrinter,
thus we would output two identical setPen() commands in the PDF
making the autotest that compares the results fail.

Task-number: QTBUG-27171
Change-Id: I601042ec59e45ef72a56f230f6112a91a259b4a5
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix QT_NO_SYSTEMTRAYICON build.
Sérgio Martins [Mon, 10 Sep 2012 18:53:01 +0000 (19:53 +0100)]
Fix QT_NO_SYSTEMTRAYICON build.

The ifndef was added to the header but was missing in
the implementation file.

Change-Id: I25111b34b9c087465306ef81c23d6667257b5e71
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agocall syncqt unconditionally in configure
Oswald Buddenhagen [Fri, 31 Aug 2012 13:47:32 +0000 (15:47 +0200)]
call syncqt unconditionally in configure

... provided perl is available.
configure.exe already does that, and there is no reason not to.

Change-Id: If398864697fcfbe4545248cec33e70a1ec4a29a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoclean up syncqt invocation
Oswald Buddenhagen [Fri, 31 Aug 2012 13:43:40 +0000 (15:43 +0200)]
clean up syncqt invocation

it needs no special env variables any more

Change-Id: I60a7ab6eabb9280b02cd510418c0842d05fc1306
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomove syncqt -check-includes handling to default_pre.prf
Oswald Buddenhagen [Fri, 31 Aug 2012 13:31:03 +0000 (15:31 +0200)]
move syncqt -check-includes handling to default_pre.prf

this is where the syncqt calls for all modules happen

Change-Id: I544e5fa6950c2babe56d78f5543d2c3262016687
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agogive location information for QMAKE_SUBSTITUTES conditionals
Oswald Buddenhagen [Tue, 28 Aug 2012 18:53:25 +0000 (20:53 +0200)]
give location information for QMAKE_SUBSTITUTES conditionals

Change-Id: I9b6bee252d4ed4bf263394ace29a4fb3b324a8cd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoStreamline forwarding of blocked events.
Friedemann Kleint [Tue, 4 Sep 2012 07:45:04 +0000 (09:45 +0200)]
Streamline forwarding of blocked events.

Do not send to layouts, invoke modalWidget() only once.

Task-number: QTBUG-27039
Change-Id: I96db02c8da544d0961c8ab25505926ac6f699342
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoport qmake to qt creator's qmake language evaluator
Oswald Buddenhagen [Wed, 5 Sep 2012 16:29:19 +0000 (18:29 +0200)]
port qmake to qt creator's qmake language evaluator

this is a monster commit which does the following things:
- import the evaluator as-is from qt creator into qmake/library/
  - integrate it into qmake's makefiles
  - overwrite proitems.h with actual special types
- remove the parts of Option which are redundant with QMakeGlobals
- make QMakeProperty a singleton owned by Option::globals. the dynamic
  handling so far made no sense.
- make QMakeProject a subclass of QMakeEvaluator, with relatively few
  extensions

the changes to existing qmake code outside project.* and option.* are
minor. implementing the changes gradually would mean changing a lot of
code which will be just replaced in the next commit, so i'm not wasting
my time on it.

Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove left-overs of the borland compiler support
Joerg Bornemann [Mon, 10 Sep 2012 13:44:04 +0000 (15:44 +0200)]
remove left-overs of the borland compiler support

Task-number: QTBUG-27184

Change-Id: Iae974c919871753500ca7e5cebdd5ef41fdd7a8a
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agotest: Remove QSKIP from tst_uic::stdOut()
Sergio Ahumada [Mon, 10 Sep 2012 14:16:14 +0000 (16:16 +0200)]
test: Remove QSKIP from tst_uic::stdOut()

This test actually passes on Windows, so removing the QSKIP

Task-number: QTBUG-26730
Change-Id: Ife1b5bd0ffa20c433070a1875dde8b6a226c331a
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agoSpecify the project name when adding a test.
Stephen Kelly [Mon, 3 Sep 2012 09:26:12 +0000 (11:26 +0200)]
Specify the project name when adding a test.

On Windows, with the devenv makecommand, this seems to be necessary.
With msbuild it is not needed, nor with nmake, but it is no harm anyway.

This is also what CMake does in its unit tests.

Change-Id: I45f867e699c28a43ee607b47db108021fc7fef8b
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Marcus D. Hanwell <marcus.hanwell@kitware.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agotest: Remove QSKIP from tst_QLocale::windowsDefaultLocale()
Sergio Ahumada [Mon, 10 Sep 2012 13:09:15 +0000 (15:09 +0200)]
test: Remove QSKIP from tst_QLocale::windowsDefaultLocale()

This test actually passes on Windows, so removing the QSKIP

Task-number: QTBUG-24543
Change-Id: Ic2666665f2882392aec92a665f51d6c5dd3355f8
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>