profile/ivi/qtbase.git
12 years agoWindows 7 - fix nativewifi bearer plugin
Shane Kearns [Fri, 4 May 2012 08:13:40 +0000 (09:13 +0100)]
Windows 7 - fix nativewifi bearer plugin

The plugin code only handled the 2 events from windows XP, while
there are more events defined on vista/7. As the scan complete event
was being ignored, updates did not complete.

Task-number: QTBUG-24503
Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoPass network session to http delegate
Shane Kearns [Fri, 27 Apr 2012 15:43:28 +0000 (16:43 +0100)]
Pass network session to http delegate

This functionality was in Qt4, and apparently lost in the
QNetworkAccessHttpBackend -> QNetworkReplyHttpImpl change

Change-Id: Ia354cfd2c10808a6543173ec017d911f1696e7fb
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoWindows: Fix Vista style for use with QProxyStyle.
Friedemann Kleint [Fri, 4 May 2012 07:11:13 +0000 (09:11 +0200)]
Windows: Fix Vista style for use with QProxyStyle.

Cleanup the treeview helper window in case XP style cleans
the handle map.
This fixes the drawing of the PE_IndicatorBranch primitives
in Qt Creator.

Task-number:  QTBUG-25395
Change-Id: Iba561709e3d4032a59690c7b9163fb69bfa98619
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdd mkspecs for 32-bit Mac OS X builds.
Morten Johan Sorvig [Thu, 3 May 2012 10:42:16 +0000 (12:42 +0200)]
Add mkspecs for 32-bit Mac OS X builds.

Add mkspecs/macx-clang-32
Add mkspecs/macx-g++-32
Add mkspecs/common/clang-mac.conf

Skip the rest of the Mac mkspecs (icc, llvm, g++40,
g++42, builder, Xcode, xlc) pending a cleanup where
we determine which ones to keep.

Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCompile.
Morten Johan Sorvig [Thu, 3 May 2012 10:29:22 +0000 (12:29 +0200)]
Compile.

Clang is picky about the missing QT_FASTCALL and
cant't find the base fetchPixel/storePixel template
function.

Change-Id: I7c0c14835b3d428f8f95961dc603d809511d7165
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove "file qmake"-based arch detection.
Morten Johan Sorvig [Thu, 3 May 2012 10:27:53 +0000 (12:27 +0200)]
Remove "file qmake"-based arch detection.

Change-Id: I0b6b66eb439c7f0f566b74cc3da0726a5ecbac34
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove all usages of "arch" CFLAGS on Mac.
Morten Johan Sorvig [Thu, 3 May 2012 08:50:01 +0000 (10:50 +0200)]
Remove all usages of "arch" CFLAGS on Mac.

Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS
and OBJECTIVE_CFLAGS. Delete the arch prf files.

32/64 bit arch selection will be made using a different
mechanism in Qt 5. Universal builds are not supported.

Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMake cupsTempFile member unconditianol.
Christoph Schleifenbaum [Thu, 3 May 2012 12:10:32 +0000 (14:10 +0200)]
Make cupsTempFile member unconditianol.

QPdfEngine has to have the same member everywhere. Otherwise
QPdfEngine and QPdfPrintEngine are compiled with different flags
(-DQT_NO_CUPS) -> QString cupsTempFile is only in QPdfEnginePrivate
in one lib -> crash.

Task-number: QTBUG-25553

Change-Id: I1d23bd14b8e68c212225ac773675a3b1bd2ca6cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRename QAbstractSocket::PauseOnNotify -> PauseOnSslErrors
Shane Kearns [Mon, 30 Apr 2012 18:14:06 +0000 (19:14 +0100)]
Rename QAbstractSocket::PauseOnNotify -> PauseOnSslErrors

Although we created an enum for pause modes to make 5.x binary
compatible with 5.0, the enum value is not well named.
In 5.1, we propose to add PauseOnProxyAuthentication to the enum.
PauseOnNotify is not clear what it means, while PauseOnSslErrors is.

Any new notification in a minor release would need a new enum value
otherwise applications would get pauses they did not expect.

Task-number: QTBUG-19032
Change-Id: I4dbb7467663b37ca7f0551d24a31bc013968bedc
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix windows cert fetcher if site presents full chain
Shane Kearns [Fri, 27 Apr 2012 19:05:05 +0000 (20:05 +0100)]
Fix windows cert fetcher if site presents full chain

If a website presents the complete certificate chain in the handshake
i.e. site -> intermediate CA -> root CA then openssl gives
a different error (SelfSignedCertificateInChain)

Because of this windows feature, that either means the site is
signed by an untrusted CA, or the CA trust status is unknown because
we don't have the root cert in the cert store.

In any case, calling the windows verification function results
in a trusted chain & the root being added to the cert store.

Task-number: QTBUG-24827
Change-Id: I2663ea2f86cd0b4dfde105d858ec1b39a340c1f6
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoMove QSocketNotifier data members to a private class
Shane Kearns [Fri, 20 Apr 2012 17:25:31 +0000 (18:25 +0100)]
Move QSocketNotifier data members to a private class

This is a binary incompatible change to allow future changes
to QSocketNotifier to be possible in a binary compatible way.

Change-Id: If90f3393e84edd3b1ac4d4132fa8e59b6b87a8ec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDocument new APIs in 5.0
Shane Kearns [Thu, 3 May 2012 17:10:19 +0000 (18:10 +0100)]
Document new APIs in 5.0

The \since 5.0 directive was missing from many places.

Task-number: QTBUG-24001
Change-Id: I191ba8891ae66d78f923164bcab2fccb16eabef9
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDocument deprecated APIs in QSsl
Shane Kearns [Thu, 3 May 2012 12:57:22 +0000 (13:57 +0100)]
Document deprecated APIs in QSsl

Task-number: QTBUG-24001

Change-Id: I8d0980bd5418e9324d0a0fe55c00b432c0a98fb1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDocument QSslCertificate deprecated functions
Shane Kearns [Wed, 2 May 2012 16:35:00 +0000 (17:35 +0100)]
Document QSslCertificate deprecated functions

With the new functions linked

Task-number: QTBUG-24001
Change-Id: I9fd2de746a6342a1f4f182189e7f2529f092c003
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove some remnants of Symbian code in src/gui/painting
Thiago Macieira [Fri, 30 Dec 2011 16:43:43 +0000 (14:43 -0200)]
Remove some remnants of Symbian code in src/gui/painting

Those files don't exist anymore. They were removed in
d1a2b53aaf76f48e195260a415ca406fa1ef01a2.

Change-Id: Id20203c5671eec8bff74fb76b8baf6b2fecb7c5b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRevert "[SIC] Make non-const the QRegExp methods that modify the internals"
Thiago Macieira [Thu, 3 May 2012 10:42:36 +0000 (12:42 +0200)]
Revert "[SIC] Make non-const the QRegExp methods that modify the internals"

This reverts commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848. The
source-incompatible change proved to be more trouble than it's
worth. Too much intrusion into the porting effort of applications for
no appreciable gain, especially considering that we have a replacement
class.

Change-Id: Ia99a2360390a2062a8ddb6e12c8f2099287a2704
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-May/003562.html
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agotroll.no changed its NS record configuration. Adapt.
Thiago Macieira [Thu, 3 May 2012 14:07:08 +0000 (16:07 +0200)]
troll.no changed its NS record configuration. Adapt.

Change-Id: I62d778da67a463da765b6ad70774449560105d7d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix tabs/whitespaces
Yuchen Deng [Mon, 30 Apr 2012 12:57:39 +0000 (20:57 +0800)]
Fix tabs/whitespaces

Change-Id: I4db24b703c69ce99f529c84248d9fe4a19a60a03
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMerge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Lars Knoll [Thu, 3 May 2012 13:43:10 +0000 (15:43 +0200)]
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master

12 years agoRevert "Don't use the pri depends line for link dependencies."
Stephen Kelly [Fri, 27 Apr 2012 14:17:22 +0000 (16:17 +0200)]
Revert "Don't use the pri depends line for link dependencies."

This reverts commit df43b9a06a73759ba74f23d9c3e91bd0347d1026.

Using the same depends information as QMake provides adds a lot of
convenience for users, and is mostly 'correct' from a CMake
point of view anyway.

Change-Id: I8f2a2f74a687c25a0dedcc491ef72ddb5b136090
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRemove Linux check for fdatasync().
Robin Burchell [Wed, 2 May 2012 14:45:03 +0000 (16:45 +0200)]
Remove Linux check for fdatasync().

Android lacks an fdatasync() implementation. Upstream sqlite has also removed
this part of the ifdef.

Change-Id: I656f1b67e8e8880308372a90b100fe9b23f96455
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoOptimise windows cert fetching and fix test case.
Shane Kearns [Wed, 18 Apr 2012 14:33:24 +0000 (15:33 +0100)]
Optimise windows cert fetching and fix test case.

If we're not going to verify the peer, or we know in advance that
windows won't have a CA root then don't ask it to verify the
certificate chain.
The test case started failing in CI when the windows cert fetcher
was integrated due to timing change. I've relaxed the timing
requirement of the test to avoid it being unstable.

Task-number: QTBUG-24827
Change-Id: I694f193f7d96962667f00aa01b9483b326e3e054
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoPull in netinet/in.h. Required for definition of sockaddr_in and friends.
Robin Burchell [Wed, 2 May 2012 12:26:40 +0000 (14:26 +0200)]
Pull in netinet/in.h. Required for definition of sockaddr_in and friends.

Change-Id: I3b1c7dc1c08ec54f5537b6019dc2554763538cfd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoWork around std::wstring not being defined on Android.
Robin Burchell [Tue, 1 May 2012 18:35:31 +0000 (20:35 +0200)]
Work around std::wstring not being defined on Android.

libstdc++ requires wchar.h (which bionic provides), but it also requires
additional functionality which bionic does not provide, thus, std::wstring
proper basically doesn't exist.

Provide a compatibility shim so we can keep API intact. This feature existed in
a similar guise in the past, but was removed in
d868c9945a188d6ad22e0b7d6d24ac7fca00ab4e.

Change-Id: I6cab6f41d04ad9dde97e3ce73506f9d8a42043fb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd some missing includes.
Stephen Kelly [Wed, 2 May 2012 22:20:42 +0000 (00:20 +0200)]
Add some missing includes.

There is a #include <QStringList> line wrapped in
QT_DEPRECATED_SINCE(5, 0).

Change-Id: I766848dfcc3bd765c57626a3d70f492ac1219091
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoImplement QLocalServer::socketOptions on windows
Shane Kearns [Wed, 2 May 2012 14:32:09 +0000 (15:32 +0100)]
Implement QLocalServer::socketOptions on windows

Tested manually using the localfortuneserver example and multiple
login sessions. The linux autotest isn't suitable for windows due
to pipe permissions not appearing in the filesystem.

Task-number: QTBUG-25147
Change-Id: I5ea4db81d1870dc45bd483fa8d0b06afede3b722
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoMerge remote-tracking branch 'origin/api_changes'
Lars Knoll [Thu, 3 May 2012 08:18:36 +0000 (10:18 +0200)]
Merge remote-tracking branch 'origin/api_changes'

Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qlogging.cpp
src/gui/kernel/qguiapplication.h
src/gui/kernel/qwindow.cpp
src/gui/kernel/qwindow.h
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp

Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e

12 years agoMSVC: Fix link warning if ship qt library without pdb files
Yuchen Deng [Mon, 30 Apr 2012 12:56:41 +0000 (20:56 +0800)]
MSVC: Fix link warning if ship qt library without pdb files

qtmaind.lib(qtmain_win.obj):-1: warning: LNK4099: PDB 'vc100.pdb' was
not found with 'qtmaind.lib(qtmain_win.obj)';
linking object as if no debug info

Change-Id: I5d515a240e917f5747ec8ca7dabde1cd1a1b14de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSkip tst_QOpenGL::openGLPaintDevice() if wrong openGL version.
Miikka Heikkinen [Wed, 2 May 2012 07:49:51 +0000 (10:49 +0300)]
Skip tst_QOpenGL::openGLPaintDevice() if wrong openGL version.

It seems that this case is failing on CI because OpenGL version,
so skip if OpenGL is not recent enough.

Task-number: QTBUG-24192
Change-Id: I543e7a092e5c107ee57cd9dce7dc5c890a0315cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoWindows: Fix QWindowsNativeFileDialogBase::directory()
Friedemann Kleint [Thu, 3 May 2012 07:59:34 +0000 (09:59 +0200)]
Windows: Fix QWindowsNativeFileDialogBase::directory()

The item was never initialized.

Change-Id: Iaf404c7f601713886c1c1346cc145460e7e89171
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdvertise window (de)activation to Qt event system
Kevin Ottens [Mon, 30 Apr 2012 15:12:42 +0000 (17:12 +0200)]
Advertise window (de)activation to Qt event system

The integration plugin now connects screens to the newly introduced
signals of the navigator event handler. The relevant screen then push a
corresponding event to the Qt event loop.

Change-Id: Ide6779bd1288c6560d113c77c60fc0ae30866d7f
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoEmit signals to notify window (de)activation
Kevin Ottens [Mon, 30 Apr 2012 15:10:06 +0000 (17:10 +0200)]
Emit signals to notify window (de)activation

The event notifier now deals also with the windowActive and
windowInactive PPS messages. The event handler simply emit the
corresponding signals.

Change-Id: I1906a47a314bf81877e4dd3dc52c6463312f3aac
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoRemove references to to/fromAscii in QString and QByteArray main docs
Thiago Macieira [Wed, 2 May 2012 10:55:49 +0000 (12:55 +0200)]
Remove references to to/fromAscii in QString and QByteArray main docs

Those functions are about to be deprecated and shouldn't be referred
to in the main documentation. Since they were temporarily changed to
mean UTF-8, this is not a behaviour change.

The next commit will update the code to match the documentation.

Change-Id: Ia8c2843c7f2b478f5691fe0224d5e631d94b1af6
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtPrintSupport]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtPrintSupport]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I73963515a44175cb63251d0508d5f28d78076d76
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtXml]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtXml]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I7e7202e6a1a84699ae0d43e4b2e7ee9ec87ed0b6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoChange QtSql documentation to recommend QString::toUtf8
Thiago Macieira [Wed, 2 May 2012 12:45:37 +0000 (14:45 +0200)]
Change QtSql documentation to recommend QString::toUtf8

Change-Id: I604166677ea182553adffc4835050f2964f2aef9
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [qdoc]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [qdoc]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I2049c1919c15142ffb1dc406d183c6669ac3b1d6
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFix documentation of QLocalServer
Shane Kearns [Wed, 2 May 2012 14:13:01 +0000 (15:13 +0100)]
Fix documentation of QLocalServer

Added \since 5.0 and corrected the enum documentation to match the
code.

Task-number: QTBUG-24001
Change-Id: I8e284b6eaaf68c46bbd0e07f4378f0c442f2edd4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets]
Thiago Macieira [Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets]

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: Ie8ac500f2f8ebe99b7525feaa7b39247e641a461
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoSimplify the size of the QVarLengthArray buffer.
Thiago Macieira [Wed, 2 May 2012 15:15:08 +0000 (17:15 +0200)]
Simplify the size of the QVarLengthArray buffer.

The previous calculation was too complex for no good
reason. QVarLengthArray actually doesn't change the size after this
change due to padding, but we don't need to include the padding in our
own calculation.

Task-number: QTBUG-25113
Change-Id: I72ea214f0d96870ecf8ff65737e7ca14e19afc7a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix the QByteArray overloads to QString::fromXXXX
Thiago Macieira [Wed, 25 Apr 2012 13:02:12 +0000 (15:02 +0200)]
Fix the QByteArray overloads to QString::fromXXXX

c951908bc201afa59402967d50fa926212845fae added these overloads, but
did not properly use qstrnlen to get the size. This means we get
subtle errors because other methods do have them.

For example:
  QByteArray ba("abc\0def", 7); // ba embedding a NUL
  QString s1(ba);
  QString s2 = QString::fromAscii(ba);
  s1 == s2; // FAILS

  QString s3;
  s3.append(ba);
  s3 == s2; // FAILS

Tested in an upcoming commit.

Change-Id: I22864521a42da789d522d7b75790696928d9ec32
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDefine P in stringbuilder.cpp, just to help in editing in the editor
Thiago Macieira [Wed, 25 Apr 2012 16:01:40 +0000 (18:01 +0200)]
Define P in stringbuilder.cpp, just to help in editing in the editor

Otherwise it keeps thinking that we have an error.

Change-Id: I8175e34dc6421884b89de9165193e32b6cdf1b62
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoQFtp - implement fast abort for downloads
Shane Kearns [Wed, 25 Apr 2012 14:53:23 +0000 (15:53 +0100)]
QFtp - implement fast abort for downloads

Most FTP servers do not support the ABOR command (they don't process
control channel traffic until the data channel is finished). Or they
require the telnet IP & sync procedure on the control channel (this
requires sending TCP urgent data, which we do not support).
Following behaviour of most browsers and GUI FTP clients, abort
downloads by resetting the data channel.
Abort of uploads needs no change, because the client closes the data
channel rather than the server.

Task-number: QTBUG-25494
Change-Id: I69e7b7c04d709d26def9a4a7081074e1cbf69701
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoQNetworkAccessManager - ensure abort reaches QFtp
Shane Kearns [Wed, 25 Apr 2012 14:31:11 +0000 (15:31 +0100)]
QNetworkAccessManager - ensure abort reaches QFtp

Previously, we just disconnected signals from QFtp and allowed it
to continue downloading in the background.

Task-number: QTBUG-25494
Change-Id: I891c2fff88ef1ee554d1ccf821a3f7998eeb8406
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agotst_qdnslookup: disabled broken testdata
Rohan McGovern [Thu, 3 May 2012 04:05:05 +0000 (14:05 +1000)]
tst_qdnslookup: disabled broken testdata

The mentioned records for råkat.se cannot be resolved.
Note these were marked with a FIXME in the first place.

Change-Id: I4ea3bbb0aec8ca1b3487c44656b48a8715228886
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agomkspecs: Define compilers and linkers elsewhere for freebsd-g++46.
Raphael Kubo da Costa [Sun, 29 Apr 2012 00:29:34 +0000 (21:29 -0300)]
mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.

Commit 996672933a61016fdc0ec6d42d536986c5080ac5 has made the
freebsd-g++46 mkspec use g++-base.conf, which on its turn resets
QMAKE_CC and QMAKE_CXX to other values.

Redefine them to gcc46 and g++46, respectively (and fix the linker
values) after the inclusion of g++-unix.conf so the settings are not
lost.

Change-Id: I2d03548fdc492c5e4c4744b636b29df2cefe2acd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoPass configured timeout to callWithCallback too.
David Faure [Wed, 2 May 2012 18:09:39 +0000 (20:09 +0200)]
Pass configured timeout to callWithCallback too.

This was missing in ccf3b9e48b2d773999a9a88e249f79380618cde6.

Change-Id: I8bc8239591b893aad361b372a36ed5b9478aff24
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6
David Faure [Wed, 2 May 2012 20:36:40 +0000 (22:36 +0200)]
Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6

I wrote nonsense in that commit. The older methods that take a timeout
all take milliseconds, and the comments in the unit test really meant
milliseconds, not seconds. 1s is not shorter than 100ms....

Change-Id: Ic18899bb0462d89575dc5a9a311478adc4dea1cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoUpdate QXbWindow orientation API
Lauro Neto [Tue, 24 Apr 2012 18:35:15 +0000 (15:35 -0300)]
Update QXbWindow orientation API

After orientation handling was split in window orientation
and content orientation QXcbWindow remained with the old api.
This patch renames setOrientation to handleContentOrientationChange,
fixing the issue of double status bar (portrait and landscape)
when running Qt5 apps with QtComponents on N9 in portrait mode.
(thanks to Simon for pointing out the difference between
changing the window and the content orientations)

Change-Id: I20d0be0c7f7e4593ac1e3c2ac2518144fc7fed0e
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoStub out QDnsLookup on Android.
Robin Burchell [Wed, 2 May 2012 12:14:11 +0000 (14:14 +0200)]
Stub out QDnsLookup on Android.

Android's resolv.h is completely crippled, so we can't use the libc resolver.

Change-Id: I07e310e3561c719f4fe0bf08e58b5194f5a76e4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoAndroid's resolv.h is busted, so stub out QHostInfo::localDomainName().
Robin Burchell [Wed, 2 May 2012 12:35:54 +0000 (14:35 +0200)]
Android's resolv.h is busted, so stub out QHostInfo::localDomainName().

Change-Id: Idcf5ca7298eed55121b690906885af0eb3fe0b9e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoDisable code using if_nameindex on Android.
Robin Burchell [Wed, 2 May 2012 12:39:50 +0000 (14:39 +0200)]
Disable code using if_nameindex on Android.

Android doesn't support if_nameindex.

Change-Id: Idb0cbf52e6cffb19fe65e30430ef53626e0eeac7
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoWork around Android not having SYS_futex.
Robin Burchell [Wed, 2 May 2012 09:23:40 +0000 (11:23 +0200)]
Work around Android not having SYS_futex.

Even though we really shouldn't, we can get away with using __NR_futex instead.

Done-with: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I0ba449b740acf2c78825f8093d1515a74f0bc9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd implementation of virtual keyboard based on BPS events
Kevin Krammer [Tue, 27 Mar 2012 16:39:49 +0000 (18:39 +0200)]
Add implementation of virtual keyboard based on BPS events

Change-Id: Ida4fa344c54db32b7b22b08a124b8c7b6df8adef
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoWindows: Fix a crash in Vista style.
Friedemann Kleint [Wed, 2 May 2012 12:18:35 +0000 (14:18 +0200)]
Windows: Fix a crash in Vista style.

Do not query the paintDevice of a backing store that has not
received a resize yet.

Change-Id: I49bf8f7e85c092c5664e5bc507802bd2cd8b62ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove unused Mac OS X code from QtWidgets
Bradley T. Hughes [Wed, 2 May 2012 11:47:05 +0000 (13:47 +0200)]
Remove unused Mac OS X code from QtWidgets

qcolordialog_mac.mm, qfiledialog_mac.mm, qfontdialog_mac.mm, and
qnspanelproxy_mac.mm are unused, remove them. The functionality they
used to provide is already included in the Cocoa platform plugin.

Change-Id: I2815d119687fd8d8dd421da36563afbd645ee000
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAvoid macro re-definition warning for QT_NO_EXCEPTIONS
Stephen Kelly [Wed, 2 May 2012 11:14:07 +0000 (13:14 +0200)]
Avoid macro re-definition warning for QT_NO_EXCEPTIONS

Change-Id: I0c4b2d00dd567af17f22b733b93032ff1056fcbd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAvoid undefined macro warning for __GXX_EXPERIMENTAL_CXX0X__.
Stephen Kelly [Wed, 2 May 2012 11:15:16 +0000 (13:15 +0200)]
Avoid undefined macro warning for __GXX_EXPERIMENTAL_CXX0X__.

The GCC use of this is already correct.

Change-Id: I28650196c7a325b552117fe2f2014ad7d6b365c2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQDoc: Remove all occurences of 'qdoc3' in source.
Casper van Donderen [Wed, 2 May 2012 11:14:29 +0000 (13:14 +0200)]
QDoc: Remove all occurences of 'qdoc3' in source.

Change-Id: I7d4e3238a9233d6aab32cc7a3c5a883e718113d5
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoAdd "make docs" target for QtNetwork and sanitize other qdocconfs.
Casper van Donderen [Mon, 30 Apr 2012 15:23:04 +0000 (17:23 +0200)]
Add "make docs" target for QtNetwork and sanitize other qdocconfs.

Change-Id: Ic9d6384b20162debeb69cb067c96c330c0fd999a
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agofix documentation for QKeySequence::StandardKey "What's This"
stockton [Mon, 30 Apr 2012 15:49:37 +0000 (08:49 -0700)]
fix documentation for QKeySequence::StandardKey "What's This"

add apostrophe and double-quotes.

Task-number: QTBUG-25545

Change-Id: Ib79953731953166ff7d8b999fee6571e62d86d01
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoEnable QML debugging of qtquick1 with CONFIG+=quick1
Kai Koehne [Wed, 2 May 2012 10:02:52 +0000 (12:02 +0200)]
Enable QML debugging of qtquick1 with CONFIG+=quick1

Make the option name align with the name of the module.

Change-Id: I29a822b55b3cb52a51592aa2bd0746a53bfe44b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoSupport mkspecs in subdirs for xcompile under windows
Andreas Holzammer [Wed, 2 May 2012 09:42:20 +0000 (11:42 +0200)]
Support mkspecs in subdirs for xcompile under windows

Support mkspecs in subdirectories for cross compilation
under windows. Mkspecs in subdirectories are separated by
slashes.

Change-Id: Id3954cc38df2922b20156589335faad989ec0537
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agomkdtemp() is not included in Android's libc
Robin Burchell [Tue, 1 May 2012 19:27:29 +0000 (21:27 +0200)]
mkdtemp() is not included in Android's libc

Use our own implementation instead.

Change-Id: Ic04dd480d52404e03e26cdf4caa1d00e4c3219c7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
12 years agoAllow creation of QOpenGLShaderProgram without a current context
Sean Harmer [Wed, 2 May 2012 09:10:39 +0000 (10:10 +0100)]
Allow creation of QOpenGLShaderProgram without a current context

This change prevents the qWarning() in QOpenGLFunctions from being
triggered when creating a QOpenGLShaderProgram object without a current
QOpenGLContext. This is a common case especially when the shader program
is a member variable of a class.

It now relies upon the QOpenGLShaderProgram::init() function to resolve
the GL function pointers when the shader program is first used which of
course should be done with an active context.

Change-Id: Ib7dc345593f2a70d72ef8f650151cc90001058ca
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoInitialize QOpenGLFunctions before using it in QOpenGLShaderProgram
Sean Harmer [Tue, 1 May 2012 15:44:57 +0000 (16:44 +0100)]
Initialize QOpenGLFunctions before using it in QOpenGLShaderProgram

Change-Id: I472e97092b05f1721b7df5759d674c213d6018c6
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix compilation of public headers with QT_NO_DEPRECATED defined
Olivier Goffart [Mon, 30 Apr 2012 12:26:41 +0000 (14:26 +0200)]
Fix compilation of public headers with QT_NO_DEPRECATED defined

Put the functions in QT_DEPRECATED_SINCE if possible

QPluginLoader::staticInstances is not documented as deprecated, and do
not reference any alternative use. So I unmarked it as deprecated.

Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoIntroduce QObject::isSignalConnected(QMetaMethod)
Olivier Goffart [Tue, 24 Apr 2012 13:01:47 +0000 (15:01 +0200)]
Introduce QObject::isSignalConnected(QMetaMethod)

This is much more performant than calling QObject::receivers(const char*)

Can be used instead of connectNotify in some cases.

Change-Id: I19e0933f678f171f515d9a0f69f0ad4fb7d894b4
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoDon't use obsolete qVariantValue, qVariantCanConvert, etc.
Debao Zhang [Sun, 29 Apr 2012 07:11:28 +0000 (00:11 -0700)]
Don't use obsolete qVariantValue, qVariantCanConvert, etc.

qVariantValue and qVariantCanConvert are Compatibility members, while in
Qt4.8 they are marked as Qt 3 Support Members.

qVariantFromValue and qVariantSetValue are Obsolete members.

Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMake eglfs hooks functionality namespace cognisant
Donald Carr [Wed, 2 May 2012 00:44:45 +0000 (00:44 +0000)]
Make eglfs hooks functionality namespace cognisant

Change-Id: Ie9f86bd0494c0423f50d0f405922ab169b2431e3
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoFixed windows platform plugin with -qtnamespace.
Rohan McGovern [Wed, 2 May 2012 00:34:43 +0000 (10:34 +1000)]
Fixed windows platform plugin with -qtnamespace.

Added missing QT_BEGIN_NAMESPACE/QT_END_NAMESPACE

Change-Id: I2ffc5ec18d19027c01c81ba9c29f6d7cac5e9619
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoFixed QtGui and QtPrintSupport with -qtnamespace and MSVC
Rohan McGovern [Wed, 2 May 2012 00:31:11 +0000 (10:31 +1000)]
Fixed QtGui and QtPrintSupport with -qtnamespace and MSVC

With this compiler, external functions declared inside other functions
will end up in the wrong namespace.

Change-Id: Ia37283d632dbc2ee0c269aeffa1f045b3e60148e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoFix regression in connectNotify(const char *) emission
Kent Hansen [Thu, 26 Apr 2012 18:17:33 +0000 (20:17 +0200)]
Fix regression in connectNotify(const char *) emission

Reimplementations of connectNotify() and disconnectNotify() can
assume that the signal argument is in normalized form, but after the
introduction of the Qt5 meta-object format, it could happen that it's
not.

The problem is that the internal QArgumentType class, which attempts
to resolve a typename to a type id, was calling QMetaType::type().
QMetaType::type() falls back to trying the normalized form of the
typename if the original argument can't be resolved as a type (this
behavior isn't documented, but that's how it works). This means that
e.g. QMetaType::type("const QString &") returns QMetaType::QString.

Since QMetaObjectPrivate::indexOfMethodRelative() (more specifically,
the methodMatch() helper function) prefers to compare type ids
over typenames (since the type ids are stored directly in the meta-
object data for built-in types), the method lookup would *succeed*
for signatures with non-normalized built-in typenames as parameters.
QObject::connect() would then think that it did not have to
normalize the signature (see "// check for normalized signatures").
The consequence was that the original, non-normalized form got
passed to connectNotify().

This commit introduces an internal typename-to-type function that
is the same as QMetaType::type(), except it doesn't try to normalize
the name. This way, the only place where normalization can occur in
the signature-to-meta-method processing is through the calls to
QMetaObject::normalizedSignature() in QObject::connect() itself.

The implication is that there are now cases where the method
signature will be decoded and processed twice, where processing it
once was sufficient before. On the other hand, it is consistent with
the pre-Qt5-meta-object behavior, where we predict that the
signature is already normalized, and only perform (comparatively
costly) normalization if the initial lookup fails.

Change-Id: Ie6b60f60b0f9a57ebd378d980329dac62d57bbd9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoQNetworkProxyFactory: check the "no_proxy" environment variable
Adrien Bustany [Mon, 23 Apr 2012 07:49:11 +0000 (10:49 +0300)]
QNetworkProxyFactory: check the "no_proxy" environment variable

The QNetworkProxyFactory class considered the http_proxy environment
variable, but not the no_proxy one. This commit adds no_proxy handling,
loosely modeled after the way curl does it.

Change-Id: Ibb9e5ffcb30fed5c95dc9fc3bc4177e20d025a50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFixed compile of QSslSocket with -qtnamespace on Windows.
Rohan McGovern [Mon, 30 Apr 2012 06:09:05 +0000 (16:09 +1000)]
Fixed compile of QSslSocket with -qtnamespace on Windows.

Q_DECLARE_METATYPE must be outside of the qt namespace.

System headers must be included outside of the qt namespace.

Change-Id: I2f48b1df87e5edae2baee6ce813af08d3e011dc0
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix warning
Olivier Goffart [Mon, 30 Apr 2012 12:32:35 +0000 (14:32 +0200)]
Fix warning

qxcbnativeinterface.cpp:209:8: warning: unused parameter ‘context’
[-Wunused-parameter]

Change-Id: I0c90e94020907cf84626af9f3fef3e6746182431
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFixed uninitialized memory in QMetaObjectBuilder::fromRelocatableData
Rohan McGovern [Tue, 1 May 2012 05:02:48 +0000 (15:02 +1000)]
Fixed uninitialized memory in QMetaObjectBuilder::fromRelocatableData

static_metacall was never set on the metaobject written by
QMetaObjectBuilder::fromRelocatableData, sometimes causing a crash.  It
should be initialized to 0.

Change-Id: I79373d895e131f0cc2ff1af6d2177a0c1a282be7
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix warning about narrowing inside {}
Olivier Goffart [Mon, 30 Apr 2012 12:14:11 +0000 (14:14 +0200)]
Fix warning about narrowing inside {}

Such as
qdialogbuttonbox.cpp:259:1: warning: narrowing conversion of
‘2147483650u’ from ‘unsigned int’ to ‘const int’ inside { }
[-Wnarrowing]

Change-Id: I00d66d96ef3af1a46935a58119668a20f8fd58c7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoconfigure: Escape '{' in getQMakeConf2 function
Sergio Ahumada [Mon, 30 Apr 2012 12:29:26 +0000 (14:29 +0200)]
configure: Escape '{' in getQMakeConf2 function

Change-Id: I7df0ca940a76b80d7b0da24dbedbabd2b8736bb8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoHandle navigator events in BPS event filter
Kevin Krammer [Tue, 27 Mar 2012 14:07:24 +0000 (16:07 +0200)]
Handle navigator events in BPS event filter

Change-Id: I37b5de4bf1e9f9bbe53910eb5e3f490172b28371
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoRegister for and handle screen events delivered through BPS
Kevin Krammer [Mon, 26 Mar 2012 14:44:07 +0000 (16:44 +0200)]
Register for and handle screen events delivered through BPS

Delegates actual event inspection and reaction to the screen event
handler class already used by the PPS screen event handler

Change-Id: Ic07efa1de3f6b452f3091e901bd8a577175e3cf0
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoWidgets: No longer use deprecated QPixmap::grabWindow(),grabWidget().
Friedemann Kleint [Mon, 30 Apr 2012 12:42:40 +0000 (14:42 +0200)]
Widgets: No longer use deprecated QPixmap::grabWindow(),grabWidget().

Change-Id: Icf0d6a672edcfd1d3d10275bb9a93bde29251e79
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAllow loading of static plugins by index
Lars Knoll [Mon, 30 Apr 2012 10:31:48 +0000 (12:31 +0200)]
Allow loading of static plugins by index

Static plugins could so far not get loaded by
index. Implement the missing support for this.

Task-number: QTBUG-25274
Change-Id: I901b08bfaf4f9fc3cb9fcea0b47f3ed89588a27b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReset pointer to 0 after freeing
Lars Knoll [Mon, 30 Apr 2012 09:56:45 +0000 (11:56 +0200)]
Reset pointer to 0 after freeing

set m_textureResource to 0 after freeing it, to
ensure we allocate a new one two lines below before
using it again 5 lines below.

Change-Id: Ib9c4de94aefed91f15d0fab0cd3c774a64f2f891
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoInitialize member variable
Lars Knoll [Mon, 30 Apr 2012 09:56:33 +0000 (11:56 +0200)]
Initialize member variable

Change-Id: Icfbe064e89b0c2f7b67ba58cbdc79347275b63b1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRestructure how we initialize hash nodes a little
Lars Knoll [Mon, 30 Apr 2012 09:01:05 +0000 (11:01 +0200)]
Restructure how we initialize hash nodes a little

This should help to silence coverity which was complaining
hundreds of times about Qt not initializing h and next in
QHashNode.

Change-Id: Ib7977693e9786d4b310799e4f428115c65bb3fee
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoInitialize members
Lars Knoll [Mon, 30 Apr 2012 07:19:31 +0000 (09:19 +0200)]
Initialize members

Change-Id: I786de497af63a45d9c38780e856a3f27c5ce8468
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoqdoc: Further changes to the QML specialization
Martin Smith [Mon, 30 Apr 2012 11:30:12 +0000 (13:30 +0200)]
qdoc: Further changes to the QML specialization

Re-adding <qmlInherits>, <qmlInheritedBy>,
<qmlInstantiates>, and <qmlSince>. Also adding
<qmlAttached>.

Change-Id: Iebd70a37b083bc404ce621d0bb9d3090dbc1109e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoNever attempt to run the dbus tests on APPLE.
Stephen Kelly [Fri, 27 Apr 2012 12:30:46 +0000 (14:30 +0200)]
Never attempt to run the dbus tests on APPLE.

The Qt buildsystem is creating the config files for it even
when it is not building QtDBus, so Qt5DBus_FOUND = True.

Re-enable the CI testing on mac with this change.

Task-number: QTBUG-25522

Change-Id: I5d2690d17fde6c5aabcbdd3e2eef9f0846edd97d
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoTemporarily disable -Woverloaded-virtual in headersclean test
Kent Hansen [Mon, 30 Apr 2012 10:45:15 +0000 (12:45 +0200)]
Temporarily disable -Woverloaded-virtual in headersclean test

This autotest fails to build after the introduction of the
QMetaMethod-based connect/disconnectNotify() functions; we are
intentionally keeping the old const char * versions (overloads) for
a limited time, to avoid disrupting other modules.

This commit will be reverted as soon as the compatibility overloads
have been removed.

Change-Id: I9b5a40b51ffa3bfa3d185410389678c262ca7b45
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoPort bearer plugins to QMetaMethod-based connectNotify()
Kent Hansen [Mon, 23 Apr 2012 19:36:04 +0000 (21:36 +0200)]
Port bearer plugins to QMetaMethod-based connectNotify()

The const char *-based API is deprecated and will be removed in Qt5.

Some of the reimplementations were commented out since the signals
being checked for aren't even declared by the relevant classes.

Change-Id: I4486d1f3242db21cebd55fb53def3904f7c236ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoPort QtDBus to QMetaMethod-based connectNotify()
Kent Hansen [Sun, 22 Apr 2012 13:05:56 +0000 (15:05 +0200)]
Port QtDBus to QMetaMethod-based connectNotify()

The const char *-based API is deprecated and will be removed in Qt5.

Change-Id: I1c7f0e46149964367f42faccfff4b89acbf16511
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoPort QNetworkSession to QMetaMethod-based connectNotify()
Kent Hansen [Sun, 22 Apr 2012 12:35:56 +0000 (14:35 +0200)]
Port QNetworkSession to QMetaMethod-based connectNotify()

The const char *-based API is deprecated and will be removed in Qt5.

Change-Id: I36f6dc761e3b5a087e38db29b761c3e9237958b4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoPort QBuffer to QMetaMethod-based connectNotify()
Kent Hansen [Sun, 22 Apr 2012 12:30:32 +0000 (14:30 +0200)]
Port QBuffer to QMetaMethod-based connectNotify()

The const char *-based API is deprecated and will be removed in Qt5.

Also fix a bug in the disconnectNotify() reimplementation; when all
signals are disconnected at once, disconnectNotify() is only called
a single time, with an invalid method as argument. Thus, the signal
connection count should be set to 0, instead of decremented.

Change-Id: Ieee92293777bff87f8b28e56e23ab55d0b8b8101
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoPort QtConcurrent to QMetaMethod-based connectNotify()
Kent Hansen [Sun, 22 Apr 2012 12:23:53 +0000 (14:23 +0200)]
Port QtConcurrent to QMetaMethod-based connectNotify()

The const char *-based API is deprecated and will be removed in Qt5.

Change-Id: Ica5b2c5020adf972db5005be8c062ddcdae8c0b4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd QMetaMethod-based QObject::connect/disconnectNotify() API
Kent Hansen [Fri, 20 Apr 2012 18:19:12 +0000 (20:19 +0200)]
Add QMetaMethod-based QObject::connect/disconnectNotify() API

This API will fully replace the const char *-based connectNotify()
and disconnectNotify() in Qt5; the old functions will be REMOVED
before Qt 5.0 final.

The new implementation fixes the long-standing issue of
connectNotify() not being called when using the (internal)
index-based QMetaObject::connect() (e.g., from QML).

As with the old API, there are still two "unintuitive" behaviors
concerning disconnectNotify():
- disconnectNotify() is not called when the signal is disconnected
  using the QObject::disconnect(QMetaObject::Connection) overload.
- disconnectNotify() is not called when a receiver is destroyed
  (i.e., when a connection is implicitly removed).

The old versions of connectNotify() and disconnectNotify() are kept
for now, and they are still called. They will be removed once known
existing reimplementations (e.g., QtNetwork, QtDBus) have been
ported to the new API.

Change-Id: I8b4f007f3c6d89199c1ba04a3e23c8ca314e0896
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoFix compiler warning in qdrawhelper.cpp
Olivier Goffart [Mon, 30 Apr 2012 11:21:57 +0000 (13:21 +0200)]
Fix compiler warning in qdrawhelper.cpp

warning: always_inline function might not be inlinable [-Wattributes]

Those function are only used in array of function pointers. They
cannot be inlined.

Change-Id: I82b10d82ac8915129dc8921b1a74d42d8547bc40
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoSupport all modality types in QPlatformDialogHelper
Bradley T. Hughes [Thu, 26 Apr 2012 11:32:14 +0000 (13:32 +0200)]
Support all modality types in QPlatformDialogHelper

Modality is not a boolean property in Qt. There are 2 types: window
modality and application modality. Native dialogs can support both of
these types as well (e.g. on Cocoa, a window modal file dialog should be
displayed as a Sheet). Remove the QPlatformDialogHelper::ShowFlags enum
and instead pass a Qt::WindowModality parameter to
QPlatformDialogHelper::show_sys().

The Windows implementation has been updated to check for
Qt::ApplicationModal instead of the ShowModal flag (since only
Qt::ApplicationModal dialogs are blocking).

The Cocoa implementation has been updated to only use non-modal and
application modal native color and font dialogs (which restores Qt 4
behavior). These are shared Cocoa panels that cannot be shown as sheets,
however. If the programmer asks for window modal color/font dialogs, we
use the Qt versions, not the native ones. The file dialog can be shown
either as a Sheet (but we need to pass an NSWindow parent for it to work
properly) or as an application modal dialog.

This change has been tested on Mac OS X with
tests/manual/windowmodality.

Change-Id: I9064987433895c55f68aac979ef8e8207fb24bbe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoMake QGtkStyle work on Qt 5.
Morten Johan Sorvig [Tue, 24 Apr 2012 12:23:02 +0000 (14:23 +0200)]
Make QGtkStyle work on Qt 5.

Mostly straightforward porting: Add configure test from Qt 4. Add X11
include to qgtkstyle_p.cpp. Use renamed QGuiApplicationPrivate::showModalWindow.

Change-Id: I83020e13ec00b49f3fe346814f881bce19a6f602
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCocoa: Fix beep-on-show for Creator menus.
Morten Johan Sorvig [Thu, 26 Apr 2012 10:29:01 +0000 (12:29 +0200)]
Cocoa: Fix beep-on-show for Creator menus.

Maintain a current window state variable in QCocoaWindnow
and use it when setting the new window state on the
NSWindow.

The NSWindow state accessors can apparently not be
trusted, in particular isZoomed always returns true
for the Creator popup menu.

Change-Id: I78f13de251f3730752813bba17459011f8558aee
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>