profile/ivi/qtbase.git
12 years agoQDateTime: Remove Julian Calendar
John Layt [Mon, 9 Jan 2012 20:50:00 +0000 (20:50 +0000)]
QDateTime: Remove Julian Calendar

Convert QDate to only use Gregorian calendar and not Julian calendar
before 1582.  In future the Julian can be used via proper calendar
classes.

Change-Id: I547a3550332057a0ab1be616706630b6afaceffc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQDateTime: Store Julian Day as qint64
John Layt [Thu, 25 Aug 2011 06:54:16 +0000 (07:54 +0100)]
QDateTime: Store Julian Day as qint64

Store the QDate Julian Day number as an qint64 instead of uint32 to
enable support for dates before 2 January 4713 BCE.  This changes the
possible date range to be approx 2.5 Quadrillion BC to 2.5 Quadrillion
AD. A qint32 was not used as it only covers 5 million BCE to 5 million
CE which does include Geological or Astronomical time.

The effective supported date range is currently 4800 BCE to 1.4 million
CE due to restrictions in existing conversion formulas.  The effective
range will be extended later with new formulas.

Change-Id: Ib4345369455b31d4edae8c933b7721e76414e914
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoUse $CFG_ARCH even if src/corelib/arch/$CFG_ARCH does not exist
Bradley T. Hughes [Sat, 4 Feb 2012 12:43:37 +0000 (13:43 +0100)]
Use $CFG_ARCH even if src/corelib/arch/$CFG_ARCH does not exist

Recent commits in src/corelib/arch have removed empty directories,
which cause configure to assume that the architecture is not supported.
This assumption is wrong, due to changes in
src/corelib/thread/qbasicatomic.h to include the correct QAtomic*
implementation based on compiler pre-defined macros instead of the
architecture found by configure.

Change-Id: I026958fb9af8af62e295e68a4643c37ac9395dc6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMinGW: Fix warnings.
Friedemann Kleint [Fri, 3 Feb 2012 14:29:13 +0000 (15:29 +0100)]
MinGW: Fix warnings.

- Special #define to access HB seems no longer necessary
  (it was causing about mismatching DLL import attributes).

Change-Id: I57cc7d57b12a67c1d549b053db81e1f198f87786
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoImprove sysroot handling with regards to configure tests.
Simon Hausmann [Fri, 3 Feb 2012 09:03:26 +0000 (10:03 +0100)]
Improve sysroot handling with regards to configure tests.

Some configure tests try to link programs, which when compiling against
a sysroot _does_ require the --sysroot= argument in order to find crt0.o.

This patch uses the existing pattern of using the export SYSROOT_FLAG
in the missing linking tests.

Change-Id: I063849c814f393d5f88de1b486ce9035b9f7bf65
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoBring qmetaobjectbuilder in sync with moc
Kent Hansen [Thu, 2 Feb 2012 13:20:24 +0000 (14:20 +0100)]
Bring qmetaobjectbuilder in sync with moc

qmetaobjectbuilder should generate meta-objects of the same version
as moc; in the future, when the moc version is bumped, QMOB has to
be adapted at the same time.

QMOB was generating version 4 meta-objects. This patch makes it
generate version 6 (the current version). This also fixes a bug with
using qt_static_metacall with QMOB (setStaticMetacallFunction()); it
was already using the version 6 qt_static_metacall signature, which
isn't compatible with version 4.

Also add tests that ensure that the QMOB-generated meta-object works
with real objects; in particular we want to test the codepaths in Qt
that check for version >= 4.

Change-Id: I64a151ea5c947a6f8b7a00e85a39866446c735e9
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdapt QtDBus to QVariant property type change
Kent Hansen [Fri, 3 Feb 2012 12:41:56 +0000 (13:41 +0100)]
Adapt QtDBus to QVariant property type change

Commit 00c8984b4e48b2a7eadfee6c3cd0cbb19f586118 changed other parts
of Qt to use QMetaType::QVariant, not 0xff, as the type for QVariant
properties. QtDBus should check for that type, and also use it for
QDBusVariant properties.

Change-Id: I21d81b59754ae44889766877a4c5066466b46d86
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoBring QtDBus meta-object generator in sync with moc
Kent Hansen [Fri, 3 Feb 2012 08:24:56 +0000 (09:24 +0100)]
Bring QtDBus meta-object generator in sync with moc

QtDBus's meta-object generator should generate objects of the same
version as moc; in the future, when the moc version is bumped,
QtDBus's meta-object generator has to be adapted at the same time.

Since QMetaObjectPrivate and related flags reside in qmetaobject_p.h,
QtDBus can just include the header instead of duplicating code.
qmetaobject_p.h also defines the meta-object revision QtDBus should
be targeting.

QtDBus was generating version 3 meta-objects. This patch makes it
generate version 6 (the current version). Since a new field was
added to QMetaObjectPrivate in revision 4 (signalCount), the
generator had to be adapted. In particular, the signal definitions
need to come before other methods (as they do with moc), since
there are functions in QObject that rely on that (e.g.
computeOffsets()).

Change-Id: I37f102d8c1be372ef6cfaf013baa87f9abb0fd5e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix compilation on MinGW.
Friedemann Kleint [Fri, 3 Feb 2012 12:30:03 +0000 (13:30 +0100)]
Fix compilation on MinGW.

- Add missing constant.
- Make FontKey a pair instead of a function-local type which
  cannot be used as template parameter for gcc.
- Fix warnings about redefinition of NOMINMAX and enumeration.

Change-Id: Ie3eb6e5b8dd9cd81210d6e10270ada0158aaf809
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoHandle the 'real' datatype correctly in the SQLite driver
Andy Shaw [Thu, 19 Jan 2012 20:39:30 +0000 (21:39 +0100)]
Handle the 'real' datatype correctly in the SQLite driver

The 'real' datatype should be seen as a QVariant::Double type and not as
a QVariant::String type otherwise it does not get presented correctly
when using a non Qt application to access it.

Test is included for QSqlQuery.

Task-number: QTBUG-16373

Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
(cherry picked from commit b23631015c23a49e3b4d296ea0a6266bfce3d4f1)
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoFix a typo TypeDefiniton -> TypeDefinition.
Jędrzej Nowacki [Fri, 3 Feb 2012 12:46:24 +0000 (13:46 +0100)]
Fix a typo TypeDefiniton -> TypeDefinition.

If you repeat a typo often enough, it becomes the right spelling.
But 49 times is definitely not enough :-)

Change-Id: I7c0bb29e68e4bff5c67277f9874df8b3ab8b2b54
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoInclude qatomic_cxx11.h for C++11 compilers
Bradley T. Hughes [Fri, 3 Feb 2012 12:38:26 +0000 (13:38 +0100)]
Include qatomic_cxx11.h for C++11 compilers

qatomic_cxx0x.h doesn't exist.

Change-Id: Iac654ecf09a1b890d25fa23625c8c43f2f7f1ecf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove empty src/corelib/arch subdirectories
Bradley T. Hughes [Fri, 3 Feb 2012 08:54:05 +0000 (09:54 +0100)]
Remove empty src/corelib/arch subdirectories

The bfin, integrity, s390, and sh4a directories included an empty
arch.pri, which is not necessary. Remove these directories and arch.pri
files.

Change-Id: I016dcef63e4b9fb4c14cc1fa7b9b91cba2080dbb
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove src/corelib/arch/nacl/* and qatomic_nacl.h
Bradley T. Hughes [Fri, 3 Feb 2012 08:50:45 +0000 (09:50 +0100)]
Remove src/corelib/arch/nacl/* and qatomic_nacl.h

This implementation uses the GCC __sync_* intrinsics, which we do not
need to duplicate after commit 2bbd2262b3974fb4e39341a23e40ffdf1655ebe9
(which added qatomic_gcc.h).

Change-Id: I59b6e4a03e83f58f4145a5ab2bfd635fe9ab686f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove src/corelib/arch/ia64/*
Bradley T. Hughes [Fri, 3 Feb 2012 08:47:29 +0000 (09:47 +0100)]
Remove src/corelib/arch/ia64/*

The out-of-line q_atomic_test_and_set_(int|ptr) functions are no longer
declared after commit 1955353149781a064bc053b86be6e221b159d4ee. They
appear to have never been used either. Remove them.

Change-Id: Ia8dfa1f585f2370091b4fd93aaf98cb10241bf31
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove src/corelib/arch/i386/* and src/corelib/arch/x86_64/*
Bradley T. Hughes [Fri, 3 Feb 2012 08:37:48 +0000 (09:37 +0100)]
Remove src/corelib/arch/i386/* and src/corelib/arch/x86_64/*

We do not want to support out-of-line QAtomic* implementations. Remove
these from the i386 and x86_64 implementations.

Change-Id: Ib6a9614b7b11bf6bccc9054b177357afd83e33e6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove src/corelib/arch/avr32/* and qatomic_avr32.h
Bradley T. Hughes [Fri, 3 Feb 2012 08:33:28 +0000 (09:33 +0100)]
Remove src/corelib/arch/avr32/* and qatomic_avr32.h

This implementation uses the GCC __sync_* intrinsics, which we do not
need to duplicate after commit 2bbd2262b3974fb4e39341a23e40ffdf1655ebe9
(which added qatomic_gcc.h).

Change-Id: I2cab86deacad1c37f17f0c5836d9faf2ad366495
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove src/corelib/arch/mips/*
Bradley T. Hughes [Fri, 3 Feb 2012 08:30:38 +0000 (09:30 +0100)]
Remove src/corelib/arch/mips/*

Commit 99fb1bea49c4de5cf3143af59f8c96a92980e58f removed the use of the
old, out-of-line q_atomic_* implementation. Remove these functions from
the library.

Change-Id: I0b239bf779e0545cb5558862e3a40f6e95fdcbd9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove src/corelib/arch/arm/*
Bradley T. Hughes [Fri, 3 Feb 2012 08:17:33 +0000 (09:17 +0100)]
Remove src/corelib/arch/arm/*

After commit dc5388e79b71d796c1207681235cf007c39810bd, which removed
support for non-EABI, qt_atomic_yield() and q_atomic_lock are no
longer used. Remove them.

Change-Id: I0f405ae63d7903c222fc2b829887207885be0a03
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove #include "qatomic_macosx.h"
Bradley T. Hughes [Fri, 3 Feb 2012 08:22:53 +0000 (09:22 +0100)]
Remove #include "qatomic_macosx.h"

This file was removed in commit 68e5fd9ebc8a3f510e3144e981a0cb358945fb9c

Change-Id: I76671f79432204c28ffa7488871d0eef07cc8dca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix QAbstractItemModel documentation
Giuseppe D'Angelo [Fri, 3 Feb 2012 01:46:26 +0000 (01:46 +0000)]
Fix QAbstractItemModel documentation

Commit 20abd88e711a2dfcbe07925f8902faa45e5110e2 refactored the
supportedDragActions methods, this oneliner adds the necessary \fn.

Change-Id: I373b039138e1cbfe0f28a0aa9eb3b65245f2132d
Reviewed-by: David Faure <david.faure@kdab.com>
12 years agoAdd support for QNX iconv implementation
Rafael Roquetto [Thu, 2 Feb 2012 15:06:05 +0000 (16:06 +0100)]
Add support for QNX iconv implementation

QNX implements the POSIX version of iconv (with non-const function
signatures). However, it is still necessary to link with libiconv, unlike most
cases. Also, its iconv_open does not know how to handle an empty string.

Change-Id: I8654703e46b9c64503aca5521ce7fae1c97d7968
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRemove QInputContext
Pekka Vuorela [Wed, 1 Feb 2012 07:43:18 +0000 (09:43 +0200)]
Remove QInputContext

This has only been around as compatibility interface for Qt4
but is now replaced by QPlatformInputContext.

Change-Id: I677dbbea46311bf39f6c5ca9dc3fb5009abe924a
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRename qatomic_windows.h to qatomic_msvc.h
Bradley T. Hughes [Thu, 2 Feb 2012 13:23:32 +0000 (14:23 +0100)]
Rename qatomic_windows.h to qatomic_msvc.h

The QT_ARCH_WINDOWS(CE) define(s) aren't used to control which
header to include anymore, so just remove it. We also do not need
the empty src/corelib/arch/windows/arch.pri.

Change-Id: I5400fc852af31907e533d0278540b8cd3da391cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoUpdate .gitignore to ignore qmake/qmake_pch.pch
Bradley T. Hughes [Thu, 2 Feb 2012 13:38:28 +0000 (14:38 +0100)]
Update .gitignore to ignore qmake/qmake_pch.pch

This file is generated when building qmake on Windows

Change-Id: I554bb2d32cfeff6791d664a5ca7b3d605db38c77
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake Clang the default makespec on Mac OS 10.7 (Lion) if Clang >= 3.0
Tor Arne Vestbø [Thu, 26 Jan 2012 12:54:07 +0000 (13:54 +0100)]
Make Clang the default makespec on Mac OS 10.7 (Lion) if Clang >= 3.0

Change-Id: Ibeb1db0eca2fb6d843d85c3f48c5f23a81230745
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFixed qsharedpointer unittest on windows
Kurt Korbatits [Wed, 1 Feb 2012 03:33:08 +0000 (13:33 +1000)]
Fixed qsharedpointer unittest on windows

- Use source file location as working directory for externaltests

Change-Id: Ic05259f48eece920b348ccbde9ba80c90dedfdd2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoprocessEvents(WaitForMoreEvents) should return after delivering events
Bradley T. Hughes [Mon, 23 Jan 2012 07:59:27 +0000 (08:59 +0100)]
processEvents(WaitForMoreEvents) should return after delivering events

The Cocoa event dispatcher sends timer, socket, and posted events
correctly, but they are not NSEvents, and as such, they do not cause
[NSApp nextEventMatchingMask] to return. When calling processEvents()
with WaitForMoreEvents, but the EventLoopExec flag isn't set, we want to
interrupt the WaitForMoreEvents.

As a result, We should not call wakeUp() at the top of processEvents(),
otherwise we end up shortcutting other event sources. We also do not
need to call QCoreApplication::sendPostedEvents() directly either in
processEvents(), it's the postedEventsSource job to do that.

The interruptLater mechanism is always run when calling processEvents()
directly (not via exec()), which causes problems when testing
processEvents(). Don't use interruptLater unless the modal sessions
change (which is indicated by the cached session pointer being reset
to zero).

Change-Id: Iec2b49a4f306b2702c979522f12a28d0b5fbd0b4
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoUn-guard a QRawFont autotest.
Pierre Rossi [Wed, 1 Feb 2012 16:13:24 +0000 (17:13 +0100)]
Un-guard a QRawFont autotest.

Let's just run this test on all platforms.

Change-Id: Iffec0ddfa8a73fd9e1af1c5ea3b49c337fa8a026
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoDon't include config.tests/unix/openssl/openssl.pri (again)
Bradley T. Hughes [Thu, 2 Feb 2012 11:02:15 +0000 (12:02 +0100)]
Don't include config.tests/unix/openssl/openssl.pri (again)

This file was removed in commit ba9302b8a9b6b50f37987261c1ade9af2ade2d3c.
Commit 8fad23f3261bdcf9bd0e11980ebfc3b00c2469c6 removed openssl.pri from
src/network/ssl/ssl.pri, but not from the qsslsocket autotest.

Change-Id: Ic1a576ee7f0ee3d68471121ba636b94ce7bae455
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReimplement QIdentityProxyModel::headerData().
Sergio Martins [Thu, 2 Feb 2012 17:00:13 +0000 (17:00 +0000)]
Reimplement QIdentityProxyModel::headerData().

The one in the base class is slower due to parent<->source
mappings.

Change-Id: Ib0b337ef5d4b5b8cd9f6e1d7c5c19a770b53e0e8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoMake QAbstractItemView::itemOptions properly initialize a V4 option
Giuseppe D'Angelo [Thu, 2 Feb 2012 17:48:31 +0000 (17:48 +0000)]
Make QAbstractItemView::itemOptions properly initialize a V4 option

Since the QStyleOptionViewItem now contains the V4 fields, they
must be properly initialized when calling itemOptions.

Change-Id: I1346e6887d2d9a7eb29cc458fa4eede0b815001c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix the chart itemview example
Giuseppe D'Angelo [Thu, 2 Feb 2012 17:40:27 +0000 (17:40 +0000)]
Fix the chart itemview example

Commit 054a4aa7dddacbe31778c5c5e9ffc9d41f803353 (being a SIC)
breaks QAbstractItemViews that used to override the
dataChanged(QModelIndex, QModelIndex) method, so this change
updates the dataChanged signature accordingly.

Change-Id: I632b6625c12dcb09abcb737ea2648efeeedeee8e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoBuild with -pedantic
Stephen Kelly [Thu, 2 Feb 2012 20:04:38 +0000 (21:04 +0100)]
Build with -pedantic

Change-Id: I42487099855d2adaecfad0a3147141f88aca1898
Reviewed-by: David Faure <faure@kde.org>
12 years agoAdd typedef for source compatibility.
Stephen Kelly [Thu, 2 Feb 2012 16:15:25 +0000 (17:15 +0100)]
Add typedef for source compatibility.

Change-Id: I73fb90b87db50db40c8a712acb25e0f966bbd5d3
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMerge QStyleOption*V{2,3,4} classes together
Giuseppe D'Angelo [Mon, 30 Jan 2012 00:52:34 +0000 (00:52 +0000)]
Merge QStyleOption*V{2,3,4} classes together

In order to keep binary compatibility, Qt 4 introduced V{2,3,4}
classes for QStyleOption subclasses. They're simple, low level
containers for various members with public access (no accessors
required).

In Qt 5.0 we can break BC, so this patch moves the members
from the derived classes into the ``base'' ones.
The ``base'' ones get a version bump matching the highest
version available, and the V{2,3,4} classes become typedefs.

This change can cause problems in code that used QStyleOption
directly, especially QStyleOptionViewItem, because the old V4
fields get default initialization but the QStyle subclasses
detect that the option is a V4 option and expect all fields
to be properly initialized. The fix in such places is to
properly initialize all fields.

Task-number: QTBUG-23522
Change-Id: I2f782da09ca5cc8c4cbafc07448fb0d33153a251
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoImprove QSurface / QWindow API a bit and use that to avoid errors
Gunnar Sletta [Thu, 19 Jan 2012 11:51:43 +0000 (12:51 +0100)]
Improve QSurface / QWindow API a bit and use that to avoid errors

Change-Id: Iadba1c3a7b8e6bc7f145455132cefed2a905c11d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpdate wrong docs for TouchPoint::id().
Laszlo Agocs [Thu, 2 Feb 2012 15:29:15 +0000 (17:29 +0200)]
Update wrong docs for TouchPoint::id().

What it states is simply not true, at least certainly
not since QPA has been introduced.

Change-Id: If8aa2120cf5fc9ca85f4f0e6832b2115a5b71fe1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoBuild with QT_NO_CAST_FROM_BYTEARRAY
Stephen Kelly [Thu, 2 Feb 2012 16:13:54 +0000 (17:13 +0100)]
Build with QT_NO_CAST_FROM_BYTEARRAY

Change-Id: Ibb79e372a3adf90c9f982f50ab711066063eff4a
Reviewed-by: David Faure <faure@kde.org>
12 years agoWindows QPA: Compile with QT_NO_CAST_FROM_ASCII, warnings.
Friedemann Kleint [Thu, 2 Feb 2012 13:40:02 +0000 (14:40 +0100)]
Windows QPA: Compile with QT_NO_CAST_FROM_ASCII, warnings.

Change-Id: I75d6a102a6a1fa0b5f8add049442f23d6fd57725
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix unintended source compatiblity break in QSslSocket
Shane Kearns [Thu, 2 Feb 2012 15:51:26 +0000 (15:51 +0000)]
Fix unintended source compatiblity break in QSslSocket

QSslSocket overrides one version of QAbstractSocket::connectToHost.
Since these functions were made virtual, this now hides the other
overloads.
Added a using statement to make the other overloads visible.

Change-Id: Ia48fdc9bd67936c75c25bb24dabd26a723bb7a05
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoVarious documentation fixes ported from Qt 4.8
Teemu Katajisto [Thu, 2 Feb 2012 10:29:54 +0000 (12:29 +0200)]
Various documentation fixes ported from Qt 4.8

Selected fixes for qtbase from 4.8 commit
3826203f744a2147bebf5f088de0d524156f59fd

Task-number: QTBUG-9466
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-14554

Change-Id: I551251dd8a87d7dd837e5927050ffd14bce9a97c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoReimplement QAbstractSocket::setReadBufferSize() properly
Bradley T. Hughes [Thu, 2 Feb 2012 08:05:04 +0000 (09:05 +0100)]
Reimplement QAbstractSocket::setReadBufferSize() properly

This function takes a qint64 argument, not an int argument.

peerwireclient.h:119:10: warning: 'PeerWireClient::setReadBufferSize'
     hides overloaded virtual function [-Woverloaded-virtual]
    void setReadBufferSize(int size);
         ^
src/network/socket/qabstractsocket.h:162:18: note: hidden overloaded
     virtual function 'QAbstractSocket::setReadBufferSize' declared here
    virtual void setReadBufferSize(qint64 size);
                 ^

Change-Id: I29b67b216147771ff2d662d309d2c31d977e9d3f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
12 years agoMove QString <-> NSString conversion to QtCore
Morten Johan Sorvig [Mon, 30 Jan 2012 13:14:04 +0000 (14:14 +0100)]
Move QString <-> NSString conversion to QtCore

Add (private) API to QCFString:
static QString toQString(NSString *)
static NSString *toNSString(const QString &)

Add implementation to qcore_mac_objc.mm. Keep the
mac_cpp since it's used for building qmake as well
as bootstrapping.

Replace usage of NSString conversion functions
in the cocoa and corewlan plugin with QCFString.

Change-Id: I9f34edd5231255aef9d8d6e9a60306174bb279b3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoCall start() even when bearer is not compiled.
Xizhi Zhu [Wed, 1 Feb 2012 21:26:36 +0000 (22:26 +0100)]
Call start() even when bearer is not compiled.

Otherwise, the HTTP request won't be sent if bearer is not compiled.

Change-Id: I9a8171fde6fe5b2db0405b4af6e1d52ac4528502
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
12 years agoRemove one un-used variant.
Xizhi Zhu [Wed, 1 Feb 2012 19:04:31 +0000 (20:04 +0100)]
Remove one un-used variant.

Change-Id: I325451f2f346cc75f23703118b451b9c7398baea
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
12 years agoFix qmlscene segfault on startup on Mac OS 10.6.
Morten Johan Sørvig [Thu, 2 Feb 2012 10:02:01 +0000 (11:02 +0100)]
Fix qmlscene segfault on startup on Mac OS 10.6.

Task-number: QTBUG-23982

The platform plugin loader was searching for plugins
in qtbase/bin and would segfault when checking if
the qmlscene binary was a plugin.

Test if "../Plugins" actually exists before setting
it as the platform plugin path.

Change-Id: Ibd887b5c5045d23e3eb62867dc7598e09d3918ad
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agospeed up font enumeration in windows platform
jian liang [Wed, 1 Feb 2012 15:19:46 +0000 (23:19 +0800)]
speed up font enumeration in windows platform

Currently, font enumeration is very slow in windows platform, it will take
several seconds to enumerate all fonts for the first time. This patch
cache the font information queried from font registry, it can
significantly speed up font enumeration.

Change-Id: Ic783877b7f3db3facf24965b0c5d669b22d40c61
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix QString::operator=(QLatin1String) for substrings
Kent Hansen [Wed, 1 Feb 2012 20:08:30 +0000 (21:08 +0100)]
Fix QString::operator=(QLatin1String) for substrings

QLatin1String now has a constructor that takes explicit length, which
makes it possible to create a QLatin1String that isn't null-terminated.
Made QString::operator=(QLatin1String) work in that case.

Change-Id: Ie77eabd2f8f036531d67cd8051a7b6305b386ccf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix QTextStream and QDebug operator<< for QLatin1String
Kent Hansen [Wed, 1 Feb 2012 19:47:26 +0000 (20:47 +0100)]
Fix QTextStream and QDebug operator<< for QLatin1String

QLatin1String now has a constructor that takes explicit length, which
makes it possible to create a QLatin1String that isn't null-terminated.
Made the QTextStream and QDebug << operators work in that case.

Change-Id: I94d051ce2ebfb2d2a403b96d25e040c80a54bf7c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix QString(QLatin1String) constructor for substrings
Kent Hansen [Wed, 1 Feb 2012 19:15:24 +0000 (20:15 +0100)]
Fix QString(QLatin1String) constructor for substrings

QLatin1String now has a constructor that takes explicit length, which
makes it possible to create a QLatin1String that isn't null-terminated.
Made the QString(QLatin1String) constructor work in that case.

Change-Id: I4f4f07a956144b7ea4aa9c58a61c755fb99ef1b3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix operator==(QLatin1String, QLatin1String) and friends for substrings
Kent Hansen [Wed, 1 Feb 2012 16:37:02 +0000 (17:37 +0100)]
Fix operator==(QLatin1String, QLatin1String) and friends for substrings

QLatin1String now has a constructor that takes explicit length, which
makes it possible to create a QLatin1String that isn't null-terminated.
Made the QLatin1String comparison operators work in that case.

Change-Id: I234ba851e67a6f5cfbb46fb6f0b22623ce40be28
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoPort the Windows atomic implementation to use QGenericAtomicOps
Bradley T. Hughes [Mon, 30 Jan 2012 14:04:06 +0000 (15:04 +0100)]
Port the Windows atomic implementation to use QGenericAtomicOps

First, we do not need to have the QT_INTERLOCKED_REMOVE_VOLATILE(a)
macro anymore either, since the value stored in QBasicAtomicInteger is
not volatile.

Windows provides Interlocked*Pointer() functions in some configurations,
so we provide a partial specialization of QAtomicOps for pointer types.
For integer types, QAtomicOps selects an implementation based on the
size of the type. At the moment, we only support 32-bit types, but it
will be possible to add 64-bit later.

Note that the 32-bit specialization of QAtomicOpsBySize declares the
Type typedef as long, not int, since the Windows Interlocked*() API
takes parameters as longs and long pointers. Since this typedef differs
from the type given to QBasicAtomicInteger<T> by the QBasicAtomicInt
typedef, we need to templatise the _q_value parameter separately from
the other arguments in QGenericAtomicOps.

This templatisation would be necessary to port other architectures, such
as PA_RISC, where we need to have an int[4] array in the atomic type
while the arguments do not need this array.

Change-Id: Id71fa1ae334da2023553cb402b45e6c285f1d344
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agofix gdb_dwarf_index.prf for applications, take two
Joerg Bornemann [Thu, 10 Nov 2011 11:43:51 +0000 (12:43 +0100)]
fix gdb_dwarf_index.prf for applications, take two

Handle the case of an empty DESTDIR.

(cherry picked from commit 122fa6b53c33364a4687919191e55899acb43797)

Change-Id: I0c2eec5736d0944b8ee97abdfa3f1121e7d8db4b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agofix gdb_dwarf_index.prf for executables
Joerg Bornemann [Wed, 9 Nov 2011 17:59:46 +0000 (18:59 +0100)]
fix gdb_dwarf_index.prf for executables

Unlike for libraries, $(TARGET) already contains $(DESTDIR).
Changing to $(DESTDIR) does break the command in that case.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 7eb770aed35fee50ff98c12e390dcb02c72b5132)

Change-Id: Idd0f30d52db432062917a1c956c3af73e6c8a6a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRenamed QInputPanel as QInputMethod
Pekka Vuorela [Tue, 24 Jan 2012 15:44:38 +0000 (17:44 +0200)]
Renamed QInputPanel as QInputMethod

QInputMethod better describes what the class is about, input methods
in general, be they panels or just composing input from key events.

Compatability headers added for old name. Not bulletproof but should be
enough to get transition done.

Change-Id: Iefde6e7ccb1ec4a3b226cef3469089e751c60fc1
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRemove duplicated function from QCocoaEventDispatcher
Bradley T. Hughes [Wed, 1 Feb 2012 13:02:02 +0000 (14:02 +0100)]
Remove duplicated function from QCocoaEventDispatcher

The qt_mac_waitForMoreModalSessionEvents() is identical to
qt_mac_waitForMoreEvents(), except that it passes a different inMode
parameter to [NSApp nextEventMatchingMask]. Change the latter function
to take the mode as a parameter itself, defaulting to the default mode.

Change the dequeue parameter to [NSApp nextEventMatchingMask] from YES
to NO. Having the function dequeue the event, and then immediately
reposting the event is not necessary.

Change-Id: Iba45d41ad3ff4d5721d1068e6d5c78585cb15810
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoDon't include config.tests/unix/openssl/openssl.pri
Bradley T. Hughes [Thu, 2 Feb 2012 08:07:27 +0000 (09:07 +0100)]
Don't include config.tests/unix/openssl/openssl.pri

This file was removed in commit ba9302b8a9b6b50f37987261c1ade9af2ade2d3c

Change-Id: Ib3a70877f6f6848c8cf072faf13da93abbe186f2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agofix memory leak of QAccessibleWidget
Jian Liang [Wed, 1 Feb 2012 06:24:00 +0000 (14:24 +0800)]
fix memory leak of QAccessibleWidget

in topLevelObjects() we should use "root->object()" instead of
"w->accessibleRoot()->object() to get the object attached to the
accessible interface. This is because "w->accessibleRoot()"
will create a new QAccessibleWidget(or its subclass) object
and this object is never released.

Change-Id: I34292b467b51d6cc439f0a1a45cd74d5f8a6a5a8
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agotests: do not run benchmarks by default in 'make check'
Sergio Ahumada [Wed, 1 Feb 2012 15:27:17 +0000 (16:27 +0100)]
tests: do not run benchmarks by default in 'make check'

`make check' is intended primarily for running functional tests.
For the most part, it does not make sense to run benchmarks in the same
test environment as the functional tests.

Change-Id: I79f867fdab295bdbd4c4b3c785dfd7ede520022e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAvoid duplicating flags/types in qmetaobjectbuilder
Kent Hansen [Wed, 1 Feb 2012 20:43:22 +0000 (21:43 +0100)]
Avoid duplicating flags/types in qmetaobjectbuilder

Presumably the contents from qmetaobject_p.h were copied
because qmetaobjectbuilder originally lived outside of qtbase,
and private headers could not be included from other modules.
But now we can just include the right headers.

Change-Id: I975df1ea94455f1bf0db1d8024de8f5379fc9fc7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
12 years agoFixed selftests unittest on windows
Kurt Korbatits [Wed, 1 Feb 2012 02:03:59 +0000 (12:03 +1000)]
Fixed selftests unittest on windows

- Needed to add toLower() for compare as c:\ and C:\ was causing
  a failure.

Change-Id: Idd55774d118b7249e88362688166b4f9d9712c7c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFixed qfile unittest on windows
Kurt Korbatits [Wed, 1 Feb 2012 00:08:33 +0000 (10:08 +1000)]
Fixed qfile unittest on windows

- Changed to set working directory based on subprogram
  stdinprocess's directory location.
- Changed QProcess execution of subprograms to use
  relative paths.

Change-Id: Idbccca635f0f61adba9721bcceeceb0a8a961dcf
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd selftest for xpass in a data-driven test.
Jason McDonald [Wed, 1 Feb 2012 04:53:33 +0000 (14:53 +1000)]
Add selftest for xpass in a data-driven test.

Change-Id: I9491d1e17ad31453ec353a11c9efb31522a16459
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoImprove readability of expectfail selftest.
Jason McDonald [Wed, 1 Feb 2012 04:33:42 +0000 (14:33 +1000)]
Improve readability of expectfail selftest.

Rename some of the test functions to improve consistency, and change the
order so that all the xfail tests are together (some new xpass tests
will be added later).

Change-Id: Ice1ac5bf61bc26109bb0d08f72eb74e1a0424101
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd testlib selftest for counting of test results.
Jason McDonald [Tue, 31 Jan 2012 04:07:58 +0000 (14:07 +1000)]
Add testlib selftest for counting of test results.

The test simply generates each possible pair of Pass, Fail and Skip
results.  At present the test simply serves to demonstrate the current
shortcomings of testlib's plain text logging, namely:

* If a test function passes for all data rows, that is counted as one
  pass, but each skipped or failed row counts as one skip or fail.

* Only skipped and failed rows are reported individually in the test
  output. Passed rows are not reported, so it is impossible to see how
  many rows were executed.

* A skip followed by a pass will be reported as an overall pass for the
  test function, but the same rows in reverse order will not report any
  overall result for the test function.

Future commits will attempt to correct these problems.

Task-number: QTBUG-22124
Change-Id: If8c7ea15fc43ba9a1bccd0e881c1efc18e705b25
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged qtextbrowser unittest to work from install directory
Kurt Korbatits [Fri, 27 Jan 2012 04:47:54 +0000 (14:47 +1000)]
Changed qtextbrowser unittest to work from install directory

- Changed qtextbrowser unittest to use TESTDATA and QFINDTESTDATA

Change-Id: I0ac7c990640d492d5ec94f5824c022a2b5075103
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged qlabel unittest to work from install directory
Kurt Korbatits [Fri, 27 Jan 2012 03:29:07 +0000 (13:29 +1000)]
Changed qlabel unittest to work from install directory

- Changed qlabel unittest to use TESTDATA and QFINDTESTDATA

Change-Id: Ide6755cd79caf91b553fb6b1412da6fbab583720
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoqopenglcontext not checking for null and failing with platform minimal
Kurt Korbatits [Tue, 24 Jan 2012 21:10:47 +0000 (07:10 +1000)]
qopenglcontext not checking for null and failing with platform minimal

- The minimal platform plugin returns null and was causing segfault.

Change-Id: Ied262692f77e9801c3d3451de7f21539f7686ca4
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agopixmap: Add QPlatformPixmap::fromData null check for the image
Holger Hans Peter Freyther [Mon, 23 Jan 2012 13:02:48 +0000 (14:02 +0100)]
pixmap: Add QPlatformPixmap::fromData null check for the image

QPlatformPixmap::fromFile is doing the null check,
QRasterPlatformPixmap::fromData is doing the null check as
well. Add the null check to QPlatformPixmap::fromData as
well. This would have avoided a crash in the directfb plugin.

Change-Id: Ifc904b2df2424e86bf0992d4e28dc256530be02d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix some warnings from clang
Lars Knoll [Wed, 1 Feb 2012 16:04:19 +0000 (17:04 +0100)]
Fix some warnings from clang

One of them was a real error, that could
lead to Data::alloc containing wrong values.

Change-Id: I48315ef6fd59188630107ebbe7bf8dbaa5da689e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoIntroduce QItemDelegate::destroyEditor virtual invoked at editor close
Thorbjørn Lund Martsum [Thu, 15 Dec 2011 15:48:51 +0000 (16:48 +0100)]
Introduce QItemDelegate::destroyEditor virtual invoked at editor close

This provides a stronger mechanism e.g when inheriting QItemDelegate.

It makes some things much easier e.g avoid delete of an editor
and maybe only delete depending on what the editor says itself.

This introduces a new virtual function.

Task-number: QTBUG-2299

Change-Id: I8410f8199775987dbacffd99e4c354fdadcdd21f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoTrivial fix in qjsonobject.h for -Werror=shadow
Jani Uusi-Rantala [Wed, 1 Feb 2012 12:34:52 +0000 (14:34 +0200)]
Trivial fix in qjsonobject.h for -Werror=shadow

There was a few errors coming from other components
using qtbase - error: declaration of 'o' shadows a
member of 'this' [-Werror=shadow].

Change-Id: Ib394f404370f001e68fde8b424cd5fff527d8fe7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMove QPlatformDialogs from QtWidgets to QtGui.
Friedemann Kleint [Wed, 1 Feb 2012 10:01:21 +0000 (11:01 +0100)]
Move QPlatformDialogs from QtWidgets to QtGui.

- Remove dependency of the Windows platform plugin on
  QtWidgets.

Change-Id: Iceb876ba7df46b49966af0fc101816654eedb5c5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoqabstractitemmodel.cpp: Fix warnings.
Friedemann Kleint [Wed, 1 Feb 2012 08:01:31 +0000 (09:01 +0100)]
qabstractitemmodel.cpp: Fix warnings.

Change-Id: I10ef89e2fab31c7f1c9ac67b2234f509fb3f28ab
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoUse QBasicMutex instead of Q_GLOBAL_STATIC QMutex
Olivier Goffart [Sun, 29 Jan 2012 19:32:22 +0000 (20:32 +0100)]
Use QBasicMutex instead of Q_GLOBAL_STATIC QMutex

QBasicMutex is a POD and can be used as a static global object.

in qpicture.cpp factoryLoader is used only once, and under the mutex, so
there is no need for Q_GLOBAL_STATIC for it, it can be a function static

in qhostinfo_unix.cpp the code seemed wrong while compiled with
namespace and QT_NO_GETADDRINFO.  I also could get rid of one include
because it was included earlier.

Change-Id: I3c700203c3e067266c20733f4bda8031446dbb86
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix parsingMode not used anymore, detected by compiler warning
David Faure [Wed, 1 Feb 2012 10:55:35 +0000 (11:55 +0100)]
Fix parsingMode not used anymore, detected by compiler warning

This came from replacing d->parsingMode with parsingMode when moving
the method to the Private class.

Change-Id: I5a025ea1128dacda97d265d401a329dbbbfb0ff7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdded WindowOverridesSystemGesturesHint to our window flags.
Gunnar Sletta [Wed, 1 Feb 2012 11:48:13 +0000 (12:48 +0100)]
Added WindowOverridesSystemGesturesHint to our window flags.

Change-Id: I42c3d3e5ef71960d16f85969b66380999fb15922
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoPrevent data loss when an ssl socket is closed by remote
Shane Kearns [Mon, 30 Jan 2012 15:52:27 +0000 (15:52 +0000)]
Prevent data loss when an ssl socket is closed by remote

SSL context was destroyed on disconnect. This makes it impossible to
decrypt buffered encrypted data. So if there is encrypted data in the
receive buffers, then don't destroy the ssl context until the socket is
destroyed.

Task-Number: QTBUG-23607
Change-Id: I16a7b4fa006647ec73049c90cdbc72686696850f
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoRemove Symbian specific code in 3rdparty.
Xizhi Zhu [Mon, 23 Jan 2012 17:45:45 +0000 (18:45 +0100)]
Remove Symbian specific code in 3rdparty.

Symbian specific code in libtiff was added by commit
6ddf09085f1e8a3cc83c4ee0c77c433d26819c35 in Qt4, code in libpng was
added by commit 66fb4038649cfd1d660204bf7c70f99a409ede4f in Qt4, so
they are removed.

Symbian specific code in freetype was copied from upstream, so kept
untouched.

Change-Id: I74f169d9283eefd91ec2e97cbd1b8f03dc449380
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoWindows configure: make -mp affect the Qt build itself
Joerg Bornemann [Wed, 1 Feb 2012 10:19:27 +0000 (11:19 +0100)]
Windows configure: make -mp affect the Qt build itself

Before -mp and -no-mp affected only projects built with Qt.
There was no way to turn off msvc_mp for the Qt build.
Qt projects can add msvc_mp themselves.

Task-number: QTBUG-23929

Change-Id: I08b9ec762c59d2604635d73396044a74f717728c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix QDnslookup build on FreeBSD
Jeremy Lainé [Wed, 1 Feb 2012 08:34:04 +0000 (09:34 +0100)]
Fix QDnslookup build on FreeBSD

Unify the includes for resolver function on unix-like platforms
to avoid build failures on BSD platforms.

Change-Id: I9accd7077d5a319a2c93642e011492d0fc779394
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoExtending the auto test for QHeaderView
Thorbjørn Lund Martsum [Sun, 1 Jan 2012 10:24:04 +0000 (11:24 +0100)]
Extending the auto test for QHeaderView

This is a test that verifies correct behaviour of qheaderview.
It includes test of swapSections, moveSection, rowcount-change,
resizeSection, hideSection and position lookup.

Change-Id: Idc1fe8167f2d95dee5c5b1161cb633cbf9495d17
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQHeaderView - Do not try to remove non-existing section
Thorbjørn Lund Martsum [Thu, 15 Dec 2011 07:11:16 +0000 (08:11 +0100)]
QHeaderView - Do not try to remove non-existing section

The end parameter passed to removeSectionsFromSpans is off by one.
removeSectionsFromSpans can currently handle/ignore it, but it is
still wrong.

Change-Id: I9148bd106504a37a5c8fd72928ab84c669eebcdb
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoSQL driver implementation to signal notification sources
Torben Dannhauer [Tue, 24 Jan 2012 20:27:36 +0000 (21:27 +0100)]
SQL driver implementation to signal notification sources

Implements the new notification signal in all QSql drivers which use notifcation.
In qt5 only ibase and psql have a notification implementation.
PSQL differentiates correctly between 'SelfSource' and 'OtherSource' whereas
ibase only signals 'UnknownSource' as a default implementation.

Change-Id: Ifcaa139b7a980ed852cf817b3f93284609360ca7
Reviewed-by: Torben Dannhauer <torben@dannhauer.info>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoInterface definition to provide notifications with a source information.
Torben Dannhauer [Tue, 24 Jan 2012 19:55:37 +0000 (20:55 +0100)]
Interface definition to provide notifications with a source information.

To differentiate between signals of different sources types, this submission adds an enum and extra signal to provide it.

Change-Id: Iad711739c41894e9c74d83072c50ae17edc695f2
Reviewed-by: Torben Dannhauer <torben@dannhauer.info>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoRemove the API duplication from QApplication.
Stephen Kelly [Tue, 31 Jan 2012 11:17:32 +0000 (12:17 +0100)]
Remove the API duplication from QApplication.

The quitOnLastWindowClosed API is present in the base
class QGuiApplication.

Change-Id: Ib2f78e48a198aa835302dcb9a31637a2c3655532
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: David Faure <faure@kde.org>
12 years agoWindows: Fix inclusion of <windows.h>
Friedemann Kleint [Wed, 1 Feb 2012 09:19:07 +0000 (10:19 +0100)]
Windows: Fix inclusion of <windows.h>

- Always use <qt_windows.h> as the last file to be included.
- Remove it from some headers, use Qt::HANDLE instead of HANDLE.
- Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE.
- Add NOMINMAX to qt_windows.h to avoid problems with the
  min/max macros.
- Remove <windows.h> from qplatformdefs.h (VS2005)

Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoAdding a QHeaderView benchmark
Thorbjørn Lund Martsum [Sun, 8 Jan 2012 21:37:01 +0000 (22:37 +0100)]
Adding a QHeaderView benchmark

This is a small QHeaderView benchmark.

It measures visualIndexAt, hideSection, showSecion, moveSection,
insert, remove and trunc rows.

Change-Id: Ibca6a2e130f4ab27d68f51e5e341a78579abd1bf
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoRevert "Put the generated <module>version.h into build tree"
Bradley T. Hughes [Wed, 1 Feb 2012 09:45:51 +0000 (10:45 +0100)]
Revert "Put the generated <module>version.h into build tree"

After discussion with Liang, I'm reverting it as he requested. This change put every header into the SYNCQT.HEADER_FILES twice for in-source builds, and the qtMODULEversion.h header did not include a path component.

This reverts commit 2fbc45b58bba860abf67fb28aa1319c9f4ededaf

Change-Id: Ie84cef19193ce5e49072f1f67a41140d9d2673b8
Reviewed-by: Liang Qi <liang.qi@nokia.com>
12 years agoAccessibility: Use new updateAccessibility() API in widgets.
Friedemann Kleint [Wed, 1 Feb 2012 09:00:06 +0000 (10:00 +0100)]
Accessibility: Use new updateAccessibility() API in widgets.

Change-Id: Id69cc28a54abc675a991f2c657a446f38313ac6e
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoIntroduced BufferQueueingOpenGL capability in platofrm integration
Gunnar Sletta [Tue, 31 Jan 2012 08:14:52 +0000 (09:14 +0100)]
Introduced BufferQueueingOpenGL capability in platofrm integration

Change-Id: Iedb7255862fd3a11aceae0e06e90a5539febc7e7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoQtDebug: Include file, line, function information
Kai Koehne [Tue, 17 Jan 2012 15:20:45 +0000 (16:20 +0100)]
QtDebug: Include file, line, function information

Record the file, line, and function where a qDebug, qWarning, qCritical
or qFatal call happens, and make this information available in a custom
message handler.

The patch uses the C preprocessor to replace qDebug, qWarning, ... with
a line that also records the current file, line, and function. Custom
message handlers can access this information via a new QMessageLogContext
argument.

Change-Id: I0a9b89c1d137e41775932d3b1a35da4ebf12d18d
Reviewed-by: David Faure <faure@kde.org>
12 years agoCompile with clang
Morten Johan Sorvig [Tue, 31 Jan 2012 20:06:18 +0000 (21:06 +0100)]
Compile with clang

Add back friend declaration removed in e8105e4.
QListViewPrivate uses QAbstractItemView::
DropIndicatorPosition, which is protected.

Change-Id: Ie9fa9422bf4fb7846637dac24a644d4814cfe622
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
12 years agoEmit QSslSocket::error in case of openssl gives an error.
Jonas M. Gastal [Thu, 26 Jan 2012 13:28:39 +0000 (11:28 -0200)]
Emit QSslSocket::error in case of openssl gives an error.

Create new QAbstractSocket::SocketError value that denotes a error in
the SSL library: SslInternalError
Create QAbstractSocket::SocketError value that denotes a error in data
provided by user cauding an SSL library error: SslInvalidUserDataError

Change-Id: I466a9389d9d7052efd8eddd1a2d6067ba26dfddb
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
12 years agoQHeaderView - preventing negative section sizes.
Thorbjørn Lund Martsum [Tue, 10 Jan 2012 18:33:14 +0000 (19:33 +0100)]
QHeaderView - preventing negative section sizes.

This patch removes the posibility to call resizeSection
with negative sizes.

Sections with negative sizes affect the other sections,
and it does not seem to have a useful, well-defined semantic.

The length can also become negative - and visualIndexAt
work strange.

Change-Id: I632beb160649fa10e2106314557b8c5a106aa3cf
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoChange syncqt default parameters for shadow building
Kalle Juhani Lehtonen [Mon, 23 Jan 2012 07:27:06 +0000 (17:27 +1000)]
Change syncqt default parameters for shadow building

For shadow builds configure creates syncqt script to shadow build
directory tree calling the original syncqt from qtbase source tree.
This wrapped script will add two default parameters when calling
the original script. Both parameters are overridden in
qtbase/mkspecs/features/default_pre.prf and are not needed except by
configure script itself in latter stages where the parameter should be
applied explicitly in shadow build condition branch.

In addition, it adds the qtdir parameter for the forwarded syncqt call to
indicate the location of qt sources for the syncqt. This also will give
correct qmake path for qtmodule-configtests script triggered from syncqt.

Changes are done both for Linux and Windows configure.

Change-Id: I307b2e76c203ee14b849f10ff629f9668da2f223
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd the event loop quitlock feature to QtCore.
Stephen Kelly [Wed, 26 Oct 2011 11:29:51 +0000 (13:29 +0200)]
Add the event loop quitlock feature to QtCore.

A feature of a ref-counted quit (managed by a quit-lock class)
is added to both QEventLoop and QCoreApplication.

This allows, for example, an event loop to quit() when there is
no more work for it to do.

quitOnLastWindowClosed is implemented in terms of the refcount in
QCoreApplication so that jobs can be completed before the
application quits.

Change-Id: I14c8f4e7ee12bbf81a6e5849290d4c8ff37fa110
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoDon't compile UIC with -O2 inside Scratchbox
Tor Arne Vestbø [Tue, 31 Jan 2012 13:24:03 +0000 (14:24 +0100)]
Don't compile UIC with -O2 inside Scratchbox

It makes QEMU crash when running the resulting binary.

Change-Id: I94e5d703205827dea88770336a8c5201e7333486
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoadd virtual destructor to QWindowSystemInterfacePrivate::WindowSystemEvent
jian liang [Fri, 27 Jan 2012 13:08:53 +0000 (21:08 +0800)]
add virtual destructor to QWindowSystemInterfacePrivate::WindowSystemEvent

Add a virtual destructor to
QWindowSystemInterfacePrivate::WindowSystemEvent class. Otherwise, in
QWindowSystemInterface::sendWindowSystemEvents() "delete event" can't
destruct the subclass of WindowSystemEvent properly.

Change-Id: Ic708f4ab61de88cd0015aa6e472d356b2de64583
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>