profile/ivi/qtbase.git
12 years agoFix compilation with Q_DECL_OVERRIDE
Olivier Goffart [Fri, 20 Apr 2012 15:18:15 +0000 (17:18 +0200)]
Fix compilation with Q_DECL_OVERRIDE

In C++11, the override keyword is placed after the function declaration

Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoBuild the tests with the build type that the top-level was invoked with.
Stephen Kelly [Fri, 20 Apr 2012 17:46:20 +0000 (19:46 +0200)]
Build the tests with the build type that the top-level was invoked with.

Change-Id: I87918276987b3a506c2ac8556940fce89a2d20cd
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQDataStream: Update Version info for doc
Aurindam Jana [Fri, 20 Apr 2012 13:13:14 +0000 (15:13 +0200)]
QDataStream: Update Version info for doc

QDataStream::Qt_5_0 was modified in
aee1f6cc413f56bf4962324799ee3887c3dd037f
but the documentation was not updated.

Change-Id: I520798a7572b0f21cd275290bcd689e1b686d098
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoSilence two warnings in QVariant's unit test.
Thiago Macieira [Fri, 20 Apr 2012 15:30:10 +0000 (17:30 +0200)]
Silence two warnings in QVariant's unit test.

These warnings are expected and correct, so ignore them.

Change-Id: I43931950e46bd3c931db869902574ee7219efa1d
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoDon't push unnecessary data to a data stream for QVariant()
Thiago Macieira [Fri, 20 Apr 2012 14:52:45 +0000 (16:52 +0200)]
Don't push unnecessary data to a data stream for QVariant()

Adjust the test because we don't read past the end anymore.

Task-number: QTBUG-25108
Change-Id: I8243f1d5ae79d1256aab2cb1132598a716a7eeeb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoWindows - "bypass proxy for local..." also affects IP addresses
Shane Kearns [Fri, 20 Apr 2012 14:04:29 +0000 (15:04 +0100)]
Windows - "bypass proxy for local..." also affects IP addresses

If the "bypass proxy for local addresses" option is enabled in
the windows proxy configuration, then do not use the proxy for
any IP address in the subnet of any network interface.

As the systemProxyForQuery api is now offering HTTP proxy tunnels
for TCP sockets, this change avoids local ad-hoc network
connections being routed through the proxy.
In the case where the local address was on a different interface to
the proxy server, it may have been unreachable through the proxy.
For example IP over USB or Bluetooth.

Change-Id: I0842732832a7795112be029d923ed168edc008d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMake sure -fPIE is added to the compile flags.
Stephen Kelly [Fri, 20 Apr 2012 09:46:40 +0000 (11:46 +0200)]
Make sure -fPIE is added to the compile flags.

Change-Id: I279881693b6eba15a2e145742b3281c9425e9b2e
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoOnly run the CMake DBus unit tests on UNIX systems.
Stephen Kelly [Fri, 20 Apr 2012 15:40:16 +0000 (17:40 +0200)]
Only run the CMake DBus unit tests on UNIX systems.

Change-Id: I0c5b511229a7ac0c2aa23a9c3d2053077e94936c
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoWindows: Remove fontengine autodetection logic
Miikka Heikkinen [Fri, 20 Apr 2012 08:57:17 +0000 (11:57 +0300)]
Windows: Remove fontengine autodetection logic

Always default to native font engine as native fonts now work in
QML applications, too.

Change-Id: Iafa5f6d25a9a3b22f49763f287e4e358216cfc2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindow geometry manual tests: Add Window state controls.
Friedemann Kleint [Fri, 20 Apr 2012 11:54:52 +0000 (13:54 +0200)]
Window geometry manual tests: Add Window state controls.

- Factor out controls from the window flags test, split state
  into Qt::WindowState (QWindow) and Qt::WindowStates(Qt::Widget).
- Add to geometry test.

Change-Id: I25b9a8696bfb7f4faef113ac82559ebb90a140c5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix missing Windows native fonts in QML applications
Miikka Heikkinen [Fri, 20 Apr 2012 08:21:45 +0000 (11:21 +0300)]
Fix missing Windows native fonts in QML applications

Windows native fonts were not getting rendered because the font engine
was cloned incorrectly for QRawFont, resulting in multi-engine instead
of the specific cloned engine.

Task-number: QTBUG-25410
Change-Id: I08f543e541739ac1b51f96f381ae1bb20b59399a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoDisable the tst_exceptionsafety_others test completely.
Thiago Macieira [Fri, 20 Apr 2012 12:06:53 +0000 (14:06 +0200)]
Disable the tst_exceptionsafety_others test completely.

QObject is no longer exception-safe and there's no one working on
improving this, so let's not block innocent commits because of this
failure.

QObjectPrivate's constructor initialises the
QObjectPrivate::threadData member to null, but the destructor
dereferences it unconditionally (the member is initialised in the
QObject constructor). That means QObjectPrivate is not exception-safe
by any definition and, so, anything depending on QObject is not
exception-safe.

Change-Id: If9d5004630b7ce2fb357e328627794caad67564f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoStabilisation of tst_qnetworkreply on windows
Shane Kearns [Wed, 18 Apr 2012 19:31:35 +0000 (20:31 +0100)]
Stabilisation of tst_qnetworkreply on windows

Workaround QTBUG-24451 by retrying creation of SocketPair if it fails
(waitForConnected and waitForNewConnection are used in the factory
function).
Skip very unstable test cases due to QTBUG-25386

Change-Id: I32129922329b895eb3719d61719c487a4d52c466
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQDoc: Remove the text around previous and next page links.
Casper van Donderen [Thu, 19 Apr 2012 19:34:42 +0000 (21:34 +0200)]
QDoc: Remove the text around previous and next page links.

Previously we printed "[Previous: <link>] and [Next: <link>]. After this
change we only print the <link>, which should include an icon.

Change-Id: I30d0c7d53b70ec2e537774d57a4ac9af01b26b16
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoRevert "List QtPrintSupport as a dependency of QtPlatformSupport."
Lars Knoll [Thu, 19 Apr 2012 12:34:38 +0000 (14:34 +0200)]
Revert "List QtPrintSupport as a dependency of QtPlatformSupport."

This reverts commit 9c7cdce672df7da5c84b0ae6ca10ff09a670a315.

platform support does not and should never depend on widgets
or print support.

Change-Id: I828d1dfc02e7993325cf653ed92100750761eaae
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix MSVC conversion warnings in new bytearray code.
Friedemann Kleint [Tue, 17 Apr 2012 15:26:29 +0000 (17:26 +0200)]
Fix MSVC conversion warnings in new bytearray code.

Change-Id: Ifc81564daf3fef0d7f08ae8d250ba41d3b1d5b0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQSslSocket: call to ERR_free_strings to free loaded error strings
Martin Petersson [Fri, 30 Mar 2012 12:38:10 +0000 (14:38 +0200)]
QSslSocket: call to ERR_free_strings to free loaded error strings

Since we are calling q_SSL_load_error_strings to load error strings
we should call ERR_free_strings to free the memory again.

Task-number: QTBUG-15732
Change-Id: Ie41291bb0e1434f82025378edfca51930712a8aa
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix crash in QCocoaBackingStore.
Morten Johan Sorvig [Fri, 20 Apr 2012 06:29:14 +0000 (08:29 +0200)]
Fix crash in QCocoaBackingStore.

QWindow->handle() may be null during construction,
and also during calls to resize(). Get and check
the pointer at each call instead of caching it
in the constructor.

Change-Id: Icd950b55e16fdd2077e3b7fe3c3393d8b89b5903
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agomingw: fix a lot of annoying warnings
Konstantin Ritt [Thu, 19 Apr 2012 09:56:50 +0000 (12:56 +0300)]
mingw: fix a lot of annoying warnings

like "QRect::intersected() redeclared without dllimport attribute
after being referenced with dll linkage" (-fno-keep-inline-dllexport)

Change-Id: Id24e5ee857579ee9f97a60de0ab88ce3db8385cf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoImplement QCocoaWindow::setWindowState.
Morten Johan Sorvig [Wed, 21 Mar 2012 10:07:35 +0000 (11:07 +0100)]
Implement QCocoaWindow::setWindowState.

Add window state change notification logic. Send
and expose event in addition to window state change
on window restore since the QWidget logic expects
this.

Modify QCocoaWindow::setVisible to sync up window
state that may have been set on the hidden window.

Refactor NSWindow event observing to use one observer
function for all notifications.

Add window state testing to tests/manual/windowflags
Add delay after showFullScreen in tst_qstatusbar to
wait for the Lion fullscreen transition.

Change-Id: I57c523cedd0644d4181b40d72046fad4fdb09a9c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSet the window title for the QWindow as well.
Morten Johan Sorvig [Fri, 20 Apr 2012 06:21:10 +0000 (08:21 +0200)]
Set the window title for the QWindow as well.

Change-Id: I2ff20307974c4b6a2a4fb09d09941d0a0dd09d0e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove insignification from QComboBox test on Ubuntu 11.10.
Jason McDonald [Thu, 19 Apr 2012 16:49:54 +0000 (02:49 +1000)]
Remove insignification from QComboBox test on Ubuntu 11.10.

This test has not failed in the last 400 CI runs.

Task-number: QTBUG-23639
Change-Id: I2a8e105ebcba3654a6aac4fd8207c8fbcd2c4db3
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoRetain bidirectional marks when eliding text
Eskil Abrahamsen Blomfeldt [Thu, 19 Apr 2012 11:36:59 +0000 (13:36 +0200)]
Retain bidirectional marks when eliding text

When the text contains unicode markers for bidirectional
text, these will not affect the width of the text, but they
might affects its layout. Thus, we need to retain these
markers in the elided text to avoid the layout of the string
changing when its allocated width changes.

Task-number: QTBUG-3768
Change-Id: I3866c32cd1dcd5fff2b8fa5b25ae89e551531a97
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoMade hellowindow example respect the expose event.
Samuel Rødal [Thu, 19 Apr 2012 07:41:48 +0000 (09:41 +0200)]
Made hellowindow example respect the expose event.

The expose event is sent when the window can start rendering.

Change-Id: Ifdfb01a107e3bf665fb7be65802cdaabea4c5a34
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdjust device mkspecs to use qpa default plugin var
Donald Carr [Thu, 19 Apr 2012 23:40:02 +0000 (23:40 +0000)]
Adjust device mkspecs to use qpa default plugin var

Change-Id: If7be3517a423324e744805e8508eb9277a600ed4
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoProvide versions of qRegisterMetaType() that do not normalize typename.
Martin Jones [Thu, 5 Apr 2012 04:32:35 +0000 (14:32 +1000)]
Provide versions of qRegisterMetaType() that do not normalize typename.

QML is quite capable of providing typenames in the correct format.
qRegisterNormalizedMetaType() does not normalize the typename, so
avoids the huge overhead.

Change-Id: I96c9a42fe0b5d36ac05a9247f6507dbf9583fa67
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoMinor QObject::receivers() optimization.
Michael Brasser [Thu, 19 Apr 2012 02:24:25 +0000 (12:24 +1000)]
Minor QObject::receivers() optimization.

Don't lock if there are no receivers.

Change-Id: I922fad10436adeb27aa4f193cc0dcbaa3f0c0f1e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMinor QObject::receivers() cleanup.
Michael Brasser [Thu, 19 Apr 2012 02:22:08 +0000 (12:22 +1000)]
Minor QObject::receivers() cleanup.

Return 0 rather than false; remove extra Q_D().

Change-Id: I3dac733c3fae27c76790f09fd6b63356767a0363
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoAdd a receivers callback to QAbstractDeclarativeData.
Michael Brasser [Thu, 19 Apr 2012 02:03:18 +0000 (12:03 +1000)]
Add a receivers callback to QAbstractDeclarativeData.

Change-Id: I767fabd66c7de535db26e779855d21ec5b94e947
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix compilation with QT_NO_DEBUG_OUTPUT defined
Andy Shaw [Thu, 19 Apr 2012 20:55:33 +0000 (22:55 +0200)]
Fix compilation with QT_NO_DEBUG_OUTPUT defined

Change-Id: If96e93c08240e0f626f8e465993b2c38b2cad832
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoEnsure that this widget has focus before sending a keypress.
Stephen Kelly [Thu, 19 Apr 2012 13:56:26 +0000 (15:56 +0200)]
Ensure that this widget has focus before sending a keypress.

This doesn't fix the bug, but confirms that it is CI flakyness.

Task-number: QTBUG-21098

Change-Id: Ic37a7574af88205371f4b2c24113d12b1386835c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoAdd some more output to debug a flaky test.
Stephen Kelly [Thu, 19 Apr 2012 14:52:02 +0000 (16:52 +0200)]
Add some more output to debug a flaky test.

Task-number: QTBUG-23638

Change-Id: Ib6a8634ede4b6461e41ce6843ac2654dcd1999f5
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoQImage: fix declaration of inline methods
Konstantin Ritt [Wed, 18 Apr 2012 18:06:30 +0000 (21:06 +0300)]
QImage: fix declaration of inline methods

Change-Id: If97f423329705dccf98742089362db9eecb55087
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMark qt_assert and qFatal as non-returning functions (excpt. MSVC)
Thiago Macieira [Fri, 23 Mar 2012 22:05:17 +0000 (19:05 -0300)]
Mark qt_assert and qFatal as non-returning functions (excpt. MSVC)

This allows the compiler to optimise the code a bit better: since they
don't return, it can assume in the code after the Q_ASSERT that the
condition was true.

MSVC is the exception: with MSVC, we have the CrtDbgReport dialog,
which allows the developer to continue execution, inside the
debugger. Therefore, we can't mark any of those functions as
non-returning because they can, after all, return.

Unfortunately, the Q_ASSERT usually expands to no code in release
mode, so the improvement in code generation happens in debug mode
only...

Change-Id: I4d542d6853cd51c71ffab1d563ed64ef7c419115
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoPrintSupport - Remove Qt5 To-do Messages
John Layt [Thu, 19 Apr 2012 19:03:05 +0000 (20:03 +0100)]
PrintSupport - Remove Qt5 To-do Messages

Task-number: QTBUG-25085
Change-Id: I4cf3cc4827f5cc0eeade36cfde94472fab3abb92
Reviewed-by: John Layt <jlayt@kde.org>
12 years agoRemove insignification from QMdiSubWindow test on Mac OS X.
Jason McDonald [Thu, 19 Apr 2012 13:59:08 +0000 (23:59 +1000)]
Remove insignification from QMdiSubWindow test on Mac OS X.

This test has four stable failures. Mark those with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-25297
Change-Id: Ic5304443c4467c46f70ef033c8f17d7f3732294c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoRemove insignification of qsocks5socketengine on Ubuntu 11.10
Jason McDonald [Wed, 18 Apr 2012 08:06:59 +0000 (18:06 +1000)]
Remove insignification of qsocks5socketengine on Ubuntu 11.10

The test has one stable failure on CI, but that failure is not observed
by all Ubuntu 11.10 users. Mark that failure with QEXPECT_FAIL when it
is going to fail and re-enable the test, following the pattern
established for the qtcpsocket test on this platform.

Task-number: QTBUG-23380
Change-Id: Ic7546595f314c55ebd36957ada92978141a1c509
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoRemove Q_WS macros from qwidget-test.
Friedemann Kleint [Thu, 19 Apr 2012 12:14:46 +0000 (14:14 +0200)]
Remove Q_WS macros from qwidget-test.

- Remove Q_WS-ifdefed sections and switch by platform name instead.
- Remove Q_OS_IRIX and Q_WS_QWS conditionals
- Fix deprecated QPixmap::grabWidget(), QPixmap::grabWindow()
  calls.
- Use QTest::qWaitForWindowShown() instead of
  qt_x11_wait_for_window_manager().
- Rewrite some platform-specific code using QPA interfaces.

Change-Id: I29ce4c4f3e5c05edddfd018dc2eabdd77738eb23
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoAdd test case for checking ConnectInBackground is set
Shane Kearns [Mon, 16 Apr 2012 13:02:02 +0000 (14:02 +0100)]
Add test case for checking ConnectInBackground is set

ConnectInBackground should be set when opening a network session
due to a background request. This test checks that.
Unfortunately, none of the bearer plugins currently in Qt Base support
this attribute, so the test result is inconclusive.
(testing with a debugger shows the attribute is set correctly, but
it can't be read back as the set is discarded by the plugin
implementation)

Change-Id: Idcf777fe489a62d4ff5007ffd291a84ba052311b
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoAbort background requests if policy changes to disallow them
Shane Kearns [Fri, 13 Apr 2012 17:05:33 +0000 (18:05 +0100)]
Abort background requests if policy changes to disallow them

Using the policy change signal from QNetworkSession.
If the new policy disallows background requests and this is a
background request, then generate an error.
This results in a TCP RST on the socket, and a
BackgroundRequestNotAllowedError on the QNetworkReply.

If the reply is already finished, no action is taken.

Change-Id: I4ff5c681a8b7b852727bb95f03664d666f4efe07
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoExpand tst_QNetworkReply::backgroundRequest to ftp & https
Shane Kearns [Fri, 13 Apr 2012 14:50:13 +0000 (15:50 +0100)]
Expand tst_QNetworkReply::backgroundRequest to ftp & https

Ftp and Http have different implementations of QNetworkReply,
so test both of them.

Change-Id: If502fa1788110edf89e619966534eea08830a19b
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoConnect usagePoliciesChanged signal to the QNetworkReply
Shane Kearns [Fri, 13 Apr 2012 13:24:03 +0000 (14:24 +0100)]
Connect usagePoliciesChanged signal to the QNetworkReply

Change-Id: Ibb8ba0b3226e402dfa9a5a1a64faa80702b11dd7
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoSet ConnectInBackground also for http implementation
Shane Kearns [Fri, 13 Apr 2012 13:13:18 +0000 (14:13 +0100)]
Set ConnectInBackground also for http implementation

Change-Id: Id82322250d86f35702036c64d725c9d093046d5b
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agofix static library names when generating .pc files for pkgconfig
Mark Brand [Thu, 19 Apr 2012 12:48:34 +0000 (14:48 +0200)]
fix static library names when generating .pc files for pkgconfig

219a688ac17052e4bb3aac9ff8a813e3f4d8da01 added the version extension
which only occurs on the DLL import library.

Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Hib Eris <hib@hiberis.nl>
12 years agoAdd a manual test for the window geometry.
Friedemann Kleint [Thu, 19 Apr 2012 09:04:54 +0000 (11:04 +0200)]
Add a manual test for the window geometry.

Test positioning QWindow and QWidget (frame / normal geometry)
for testing QPA plugins.
The test can be built with  Qt 4 for comparison.

Change-Id: I695bf28d5fdf738262d322518d01ad04aa5056f5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoRemove insignification from QMenuBar test on Ubuntu 11.10.
Jason McDonald [Thu, 19 Apr 2012 14:44:40 +0000 (00:44 +1000)]
Remove insignification from QMenuBar test on Ubuntu 11.10.

This test hasn't failed in the last 400 CI builds.

Task-number: QTBUG-4965
Change-Id: I2ff03b7a12906a2b583b3127bf47c12b901ed319
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoRemoved legacy pixmap and image cleanup hooks.
Kim Motoyoshi Kalland [Tue, 17 Apr 2012 10:22:39 +0000 (12:22 +0200)]
Removed legacy pixmap and image cleanup hooks.

Task-number: QTBUG-25114

Change-Id: Id87172665ec15874e293e3891738e6366aef4554
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agofix qsslsocket build in -permissive mode (assigning const char* to char*)
Konstantin Ritt [Wed, 18 Apr 2012 01:54:30 +0000 (04:54 +0300)]
fix qsslsocket build in -permissive mode (assigning const char* to char*)

Change-Id: I76269630ebabdf601c2fcb5f65a8dffbd6cdbc5e
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix detection of default platform plugin.
Girish Ramakrishnan [Wed, 18 Apr 2012 22:57:00 +0000 (15:57 -0700)]
Fix detection of default platform plugin.

Let configure generate the QT_QPA_DEFAULT_PLATFORM_NAME in
qconfig.h. This allows us to override the platform name
using a configure argument.

This commit adds -qpa <platform> that lets the user specify
the default platform at configure time. Note that the default
platform is not checked against the tree since plugins are
allowed to exist outside the Qt source tree.

In the absence of -qpa argument, configure checks the mkspec
for a variable named QT_QPA_DEFAULT_PLATFORM. This check is
implemented only in the unix configure because it will be primarily
used in custom mkspecs (devices, boards).

If -qpa argument is absent and the mkspec variable is absent,
the default value is determined based on the OS as below:
    Unix - "xcb"
    Windows - "windows"
    Mac - "cocoa"
    QNX - "qnx"

Done-with: Jørgen Lind

Change-Id: I0df31811a1b901a3242bfada1232e596ebda04f4
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed QSimd WindowsCE build
Bjoern Breitmeyer [Thu, 19 Apr 2012 13:37:24 +0000 (15:37 +0200)]
Fixed QSimd WindowsCE build

Change-Id: I94de251cf1f283d30f92d0fb9d37a1646765cbdd
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoRemove insignification from QDoubleSpinBox test on Ubuntu 11.10.
Jason McDonald [Thu, 19 Apr 2012 13:46:20 +0000 (23:46 +1000)]
Remove insignification from QDoubleSpinBox test on Ubuntu 11.10.

This test has not failed during the last 400 CI builds.

Task-number: QTBUG-23641
Change-Id: Ibcb840679e023db41456e41eedcfcc38ecedbaac
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoCompile fix if QT_NO_CLIPBOARD defined
Andreas Holzammer [Thu, 19 Apr 2012 13:56:29 +0000 (15:56 +0200)]
Compile fix if QT_NO_CLIPBOARD defined

Change-Id: Ie8ecaa2ba8f99d0b531b3a81b5f0005508e677eb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoCompile fix if QT_NO_CLIPBOARD defined
Andreas Holzammer [Thu, 19 Apr 2012 13:53:42 +0000 (15:53 +0200)]
Compile fix if QT_NO_CLIPBOARD defined

Change-Id: I818122f2b2d2119248ad2e84b138aab8ab621a41
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agofix undefined behavior issue on Integrity
Konstantin Ritt [Tue, 17 Apr 2012 14:07:15 +0000 (17:07 +0300)]
fix undefined behavior issue on Integrity

in contrast to ::strdup(), qstrdup() allocates memory via new[];
deallocating this memory with free() leads to undefine behavior.

Change-Id: I0692c4bef010c05de547283b00b6c6043ac24c79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agooptimize canonicalOrderHelper() for generic case
Konstantin Ritt [Tue, 10 Apr 2012 15:00:32 +0000 (18:00 +0300)]
optimize canonicalOrderHelper() for generic case

if there is no need to swap codepoints A and B,
then we proceeding with advance to the next codepoint B
that becomes A, and some next codepoint C becomes B;
in such case we can easily skip the re-calculations for A
by using previously calculated results for B

Change-Id: I5c63589c274acaddf0f6a4cb1e0608d352a0c1b3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoqwindowsintegration: fix build with -no-accessibility config option set
Konstantin Ritt [Thu, 19 Apr 2012 09:50:05 +0000 (12:50 +0300)]
qwindowsintegration: fix build with -no-accessibility config option set

Change-Id: I2f4080b04f61ec425d41180f0163cebcc745c1b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQDoc: Generate index file for DITAXML.
Casper van Donderen [Thu, 19 Apr 2012 10:19:42 +0000 (12:19 +0200)]
QDoc: Generate index file for DITAXML.

This change moves the fullDocumentLocation function to the generator
base-class and adds generateIndex to the DITAXML Generator.
All function calls to fullDocumentLocation are now handled by the static
function in the base-class which will use the file extension from the
currently active generator (either DITAXML or HTML).

Change-Id: I24ce09c05a63eb5980b1243c58990e7ce9d42036
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoRe-enable QGLThreads autotest on Mac OS X.
Jason McDonald [Wed, 18 Apr 2012 14:52:23 +0000 (00:52 +1000)]
Re-enable QGLThreads autotest on Mac OS X.

This test passes consistently on Mac OS, but crashes consistently on
Windows and fails consistently on Ubuntu 10.04 and 11.10.

Disable the test only on platforms where it known to fail, so that CI
can use it to detect future regressions on platforms where the test
currently passes.

Task-number: QTBUG-22560
Change-Id: I0def45e1ed7dd3387e42e7294a495c89bc0caea6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRe-enable QGL autotest on Mac OS X and Ubuntu 11.10.
Jason McDonald [Wed, 18 Apr 2012 13:59:18 +0000 (23:59 +1000)]
Re-enable QGL autotest on Mac OS X and Ubuntu 11.10.

This test passes consistently on Mac OS and Ubuntu 11.10, but crashes
consistently on Windows and fails consistently on Ubuntu 10.04.

Disable the test only on platforms where it known to fail, so that CI
can use it to detect future regressions on platforms where the test
currently passes.

Task-number: QTBUG-25293
Change-Id: I5d6a474ea1e6fdf3983f164ebc181e1dd6e3f639
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove insignification from QtConcurrentFilter test.
Jason McDonald [Wed, 18 Apr 2012 12:14:04 +0000 (22:14 +1000)]
Remove insignification from QtConcurrentFilter test.

This test has one unstable failure that occurs about 0.8% of the time in
CI.  Make the test catch this particular failure and re-enable the rest
of the test.

Task-number: QTBUG-20688
Change-Id: I22f5d372db77ea35163f96195ac0c174d8078899
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't use QByteArrayLiteral for a non-stored QByteArray
Thiago Macieira [Wed, 18 Apr 2012 12:47:32 +0000 (14:47 +0200)]
Don't use QByteArrayLiteral for a non-stored QByteArray

Unless you're creating a QByteArray that you will store, don't use
QByteArrayLiteral. Using it for 1 byte that is always concatenated to
something else is an extreme waste.

Change-Id: Icc29e4c4cb1d0aad1714bdeec8ff41da7c301af9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix font substitutions.
Friedemann Kleint [Wed, 11 Apr 2012 15:30:17 +0000 (17:30 +0200)]
Fix font substitutions.

- Remove remains of platform-specific substitution tables in QtGui.
- Deprecate QFont::removeSubstitution() in favour of
  QFont::removeSubstitutions() (as suggested in the comments).
- Clean up substitution code, remove postfix operator++ on
  iterators and repeated invocation of .end().

Change-Id: I2e82e4ce2dd357d49e4d2b7fd6f95785acfcda95
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years ago-device: create qdevice.pri only when build tree is initialized
Girish Ramakrishnan [Wed, 18 Apr 2012 22:35:24 +0000 (15:35 -0700)]
-device: create qdevice.pri only when build tree is initialized

The build tree is not initialized when -help is passed to configure.
The mkspecs/ directory is not created and thus the mv fails results
with the following error:
mv: cannot move `.device.vars' to `/tmp/qtbase/mkspecs/qdevice.pri': No such file or directory

The solution is to create qdevice.pri just before we run config.tests.

Change-Id: Ie83018e27a03bb840d213aae8c963b0074e62bb4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoreplace getenv("HOME") with a "centralized" QDir::homePath()
Konstantin Ritt [Wed, 18 Apr 2012 19:49:02 +0000 (22:49 +0300)]
replace getenv("HOME") with a "centralized" QDir::homePath()

Task-number: QTBUG-4902

Change-Id: Ie9124de45be2d8e859f8b0aaea246e660145a1c5
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoDon't fail to configure if QNX platform plugin is built.
Stephen Kelly [Wed, 18 Apr 2012 12:21:10 +0000 (14:21 +0200)]
Don't fail to configure if QNX platform plugin is built.

Change-Id: I781eab2fb07fe62d733317b8a72dd899caaf5a80
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd a functionality test for DirectFB to ensure it compiles.
Thiago Macieira [Wed, 18 Apr 2012 13:56:26 +0000 (15:56 +0200)]
Add a functionality test for DirectFB to ensure it compiles.

Some versions of the DirectFB headers are unclean and will cause Qt
compilation failures. So blacklist those versions. Version 1.5.3
(present in Fedora 16) is known to be buggy and gets disabled by this
patch.

The compile error was:
  qurlquery.h:169:5: error: ‘typeof’ was not declared in this scope

(qplatformcursor_qpa.h includes qevent.h which includes qurl.h which
includes that)

The error comes from the Q_FOREACH expansion. Note that Q_FOREACH uses
__typeof__, so it's supposed to be safe, unless someone ill-advised
goes and defines the GCC "safe" macro (double underscores on both
sides) to something else.

Change-Id: Ida41ee3b3c2fcba86a7e12182e7055123166693b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoGet rid of warning when building qplatformwindow_qpa.cpp.
Samuel Rødal [Wed, 18 Apr 2012 10:28:02 +0000 (12:28 +0200)]
Get rid of warning when building qplatformwindow_qpa.cpp.

This Q_UNUSED was unintentionally lost in 55fa3c189f88933d390177ad5606d.

Change-Id: I832ee7c8d46cf66f7b63045015bef181fddebeef
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoDo not force OpenGL sample buffers on in the qnx qpa plugin
Sean Harmer [Tue, 17 Apr 2012 19:40:19 +0000 (20:40 +0100)]
Do not force OpenGL sample buffers on in the qnx qpa plugin

Change-Id: I6af40382102f2163f5ad8606b498a89db420c5d6
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoRemove internal QClipboardEvent
Laszlo Agocs [Thu, 19 Apr 2012 06:51:18 +0000 (09:51 +0300)]
Remove internal QClipboardEvent

This class is not in use with QPA.

Also remove useless sending of QEvent::Clipboard from the
QGuiApplication dtor. That event is not (cannot be) handled by the
platform plugins and is not used at all. Perhaps it should be removed
altogether from the public API.

Change-Id: I478b31ff9875a8dfff99bddafd335ab02a5fe477
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoExtend QUDeviceHelper to detect DRM graphics devices.
Hannu Lyytinen [Wed, 18 Apr 2012 21:28:15 +0000 (00:28 +0300)]
Extend QUDeviceHelper to detect DRM graphics devices.

KMS QPA plugin duplicates udev code needlessly; merging the
functionality here.

Change-Id: I69be8549f1feee298fe28215d491c8ce5de96b18
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agodirectfb: Fix namespace compilation.
Toby Tomkins [Thu, 19 Apr 2012 01:24:50 +0000 (11:24 +1000)]
directfb: Fix namespace compilation.

Change-Id: I55450e0585092f0b052cf6755acc541915c411e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove insignification from QFocusEvent test on Mac OS X.
Jason McDonald [Tue, 17 Apr 2012 14:26:36 +0000 (00:26 +1000)]
Remove insignification from QFocusEvent test on Mac OS X.

This test has one stable failure.  Mark that failure with QEXPECT_FAIL
and re-enable the test.

Task-number: QTBUG-22815
Change-Id: I38445b659235076b00d9dd82d2a824d1caa1439b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove insignification from QAccessibility test on Mac OS X.
Jason McDonald [Tue, 17 Apr 2012 14:15:16 +0000 (00:15 +1000)]
Remove insignification from QAccessibility test on Mac OS X.

This test has one stable failure.  Mark that failure with QEXPECT_FAIL
and re-enable the test.

Task-number: QTBUG-22812
Change-Id: I1e1ad63472db7ba724c9936ae718de0b3b078bbd
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove insignification from QClipboard test on Mac OS X.
Jason McDonald [Tue, 17 Apr 2012 12:41:17 +0000 (22:41 +1000)]
Remove insignification from QClipboard test on Mac OS X.

This test hasn't failed for more than 250 CI runs, before which it was
failing consistently.

Change-Id: I0c2f7d3893731c800bebb0d3d51312d0d0948eb5
Reviewed-by: QTBUG-23057
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove insignification of QStaticText test on Mac OS X.
Jason McDonald [Tue, 17 Apr 2012 12:29:08 +0000 (22:29 +1000)]
Remove insignification of QStaticText test on Mac OS X.

This test has not failed in more than 300 CI runs, before which it was
failing consistently.

Change-Id: Ib9a0e4120b276e5620b544a0836134f1cbac7c84
Reviewed-by: QTBUG-23063
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRe-enable QTextScriptEngine test.
Jason McDonald [Tue, 17 Apr 2012 12:18:56 +0000 (22:18 +1000)]
Re-enable QTextScriptEngine test.

The test has two stable failures. Mark these with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-23064
Change-Id: Ibb607ac252a6690d0d37f650a5ae41e5e2a681a2
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRe-enable QFontDatabase test on Mac OS X.
Jason McDonald [Tue, 17 Apr 2012 11:36:04 +0000 (21:36 +1000)]
Re-enable QFontDatabase test on Mac OS X.

This test has one stable failure on Mac.  Mark that failure with
QEXPECT_FAIL so that the rest of the test can be used by CI to catch
regressions.

Also, change the failing QVERIFY to QCOMPARE so that the mismatching
QStringList values will appear in the test output.

Task-number: QTBUG-23062
Change-Id: Icb0cccfe0bd5bc74a6a2c1ddba89c1f55f5e64de
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoDoc: Prepare for building modular QtCore docs.
Casper van Donderen [Tue, 20 Mar 2012 18:37:07 +0000 (19:37 +0100)]
Doc: Prepare for building modular QtCore docs.

This change fixes most qdoc errors in QtCore. There are about 900 left.
The main thing this change does is moving documentation from qtcore from
/doc/src to /src/corelib/doc.
Other issues resolved are mis-use of qdoc commands.

Change-Id: I002d01edfb13575e8bf27ce91596a577a92562d1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoRe-enable QPrinterInfo test on Mac OS X.
Jason McDonald [Wed, 18 Apr 2012 13:16:28 +0000 (23:16 +1000)]
Re-enable QPrinterInfo test on Mac OS X.

This test has not failed in the last 1000 CI runs on Mac.  It only fails
when the test machine has some printers configured, which is not
presently true for the CI machines.

The two options are to disable the test on all unix platforms (because
it fails on all unicies when there are printers present) or to enable
the test for all platforms so that CI can catch regressions that don't
depend on having printers connected.  I choose the latter option.

If the CI machines are configured with printers before the known bug is
fixed, the failures should be marked with QEXPECT_FAIL rather than
disabling the whole test again.

Task-number: QTBUG-23060
Change-Id: I3cebed4aefdd088ff00215ea9d7413f90bd9e9b1
Reviewed-by: John Layt <jlayt@kde.org>
12 years agoRe-enable the QItemDelegate test on Ubuntu 11.10.
Jason McDonald [Wed, 18 Apr 2012 15:55:56 +0000 (01:55 +1000)]
Re-enable the QItemDelegate test on Ubuntu 11.10.

This test used to be unstable, but has not failed for more than 400 CI
builds.

Task-number: QTBUG-23637
Change-Id: I0d92136aa9d641e447820ab19b53034f475f74da
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoReally marked tst_QProcess as insignificant on Windows.
Rohan McGovern [Wed, 18 Apr 2012 23:43:24 +0000 (09:43 +1000)]
Really marked tst_QProcess as insignificant on Windows.

This test hangs ~2.6% of the time in CI.

The previous commit which attempted to mark this test as insignificant
did not work due to this .pro file doing a load(testcase) prior to the
line which set CONFIG += insignificant_test.  testcase.prf must be
loaded _after_ insignificant_test is set.

Task-number: QTBUG-25342
Change-Id: I20470337fda8235e2fd0b6e8d5f564c8c57d167e
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agoChange coreservices -> ios
Ian Dean [Fri, 30 Mar 2012 08:03:00 +0000 (09:03 +0100)]
Change coreservices -> ios

Replace "contains(QT_CONFIG, coreservices)" with "!ios" in config files.
Replace "QT_NO_CORESERVICES" with "Q_OS_IOS" in source files.

Change-Id: Id3b02316b245a24ce550e0b47596d18a4a409e4f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoqdbusxml2cpp: fix build on Windows
Konstantin Ritt [Wed, 18 Apr 2012 00:45:53 +0000 (03:45 +0300)]
qdbusxml2cpp: fix build on Windows

bootstrapped process defines QT_NO_LIBRARY but QT_NO_LIBRARY
is not supported on Windows

Change-Id: I353a8690832e292522ed6c39a7e0ca19b0980e01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoconfigure: fix script error with -help
Girish Ramakrishnan [Wed, 18 Apr 2012 22:48:29 +0000 (15:48 -0700)]
configure: fix script error with -help

configure -help results in the following error:
[: 3174: missing ]

Change-Id: Ibe7a5292087924d3efd0c87d9fb91deee831171f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDo not assert when QVariant is constructed from an invalid type id
Jędrzej Nowacki [Wed, 18 Apr 2012 12:40:50 +0000 (14:40 +0200)]
Do not assert when QVariant is constructed from an invalid type id

That change also fix moduleForType() which was wrongly recognizing
negative ids as belonging to Core.

New tests were added.

Change-Id: I40a5819effb32489a45937011980457387c9f8be
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix memory leak when drawing text in non-common script
Eskil Abrahamsen Blomfeldt [Wed, 18 Apr 2012 08:57:43 +0000 (10:57 +0200)]
Fix memory leak when drawing text in non-common script

When the font engine cache was updated for new parameters, we
would overwrite the cached engine, but not deref the old
cached engine, thus it would never be deleted.

This is manual cherry pick of 44c14470e5b28e45c19d6959b114e063cf3f4d83
from 4.8 branch.

Change-Id: Ice2e555fe380dc9851ef490fa1a6928936ae4c35
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoOptimized EGLFS backing store a bit.
Samuel Rødal [Tue, 17 Apr 2012 06:46:13 +0000 (08:46 +0200)]
Optimized EGLFS backing store a bit.

Avoid expensive image copying when possible.

Change-Id: Ia79919ea7652d7bfdd744198c494c20cb78a0f48
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoFix a CMake unit test.
Stephen Kelly [Wed, 18 Apr 2012 12:36:08 +0000 (14:36 +0200)]
Fix a CMake unit test.

This has been broken since modules do not currently find
their (public) dependencies.

Change-Id: I0c9e7c46f7a6499993c98aa6d33996bdd3a1be5f
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoBuild the first CMake test if *at least* version 2.8.7 is available.
Stephen Kelly [Wed, 18 Apr 2012 12:33:39 +0000 (14:33 +0200)]
Build the first CMake test if *at least* version 2.8.7 is available.

Change-Id: I061130e5b937ad818cc9016ae62d5890092d60f2
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix unused variable warning.
Stephen Kelly [Wed, 18 Apr 2012 11:51:40 +0000 (13:51 +0200)]
Fix unused variable warning.

Change-Id: I8daa2912e1c26e9e9f6bb77f64eb3e06c6715cce
Reviewed-by: David Faure <faure@kde.org>
12 years agoRemove insignification of QNetworkInterface autotest on Windows.
Jason McDonald [Wed, 18 Apr 2012 11:13:06 +0000 (21:13 +1000)]
Remove insignification of QNetworkInterface autotest on Windows.

This test has not failed in the last 300 CI runs.

Change-Id: I559ea223856b1460deb343384d5b4439f42a41d7
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoRemove insignification from the Lancelot test.
Jason McDonald [Tue, 17 Apr 2012 14:41:15 +0000 (00:41 +1000)]
Remove insignification from the Lancelot test.

This test has not failed in the last 400 CI builds.

Change-Id: I22b59565a6a6cb48653bd9b0d967abbf074d59a4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUpdate task numbers for QUdpSocket autotest.
Jason McDonald [Wed, 18 Apr 2012 09:55:05 +0000 (19:55 +1000)]
Update task numbers for QUdpSocket autotest.

Reference tasks with detailed analysis of failures rather than generic
task for blacklisted tests.

Change-Id: Ibd0ed836ffb84fe9aa14488d43085316e666de21
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix some unused variable warnings.
Stephen Kelly [Wed, 18 Apr 2012 09:55:15 +0000 (11:55 +0200)]
Fix some unused variable warnings.

Change-Id: I3ffbb155c0efa65bb33a0e2ce80dbd75dc56f3fc
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFix some unsigned comparison warnings.
Stephen Kelly [Tue, 17 Apr 2012 16:12:06 +0000 (18:12 +0200)]
Fix some unsigned comparison warnings.

Change-Id: I4e72dbb6e207757c8bb75a7726c83ed5916df094
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoFix build with QT_NO_CLIPBOARD.
Stephen Kelly [Tue, 17 Apr 2012 15:47:03 +0000 (17:47 +0200)]
Fix build with QT_NO_CLIPBOARD.

Change-Id: I82558e1e432934b98236d69106fb98e44e819095
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoRemove todo comments that are no longer relevant.
Kim Motoyoshi Kalland [Tue, 17 Apr 2012 11:17:16 +0000 (13:17 +0200)]
Remove todo comments that are no longer relevant.

Task-number: QTBUG-25067

Change-Id: I5d3022a2881a3c6c97429f609fe567bd9970a046
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoRevert "Fix memory leak of QFontEngineData"
Lars Knoll [Wed, 18 Apr 2012 06:57:32 +0000 (08:57 +0200)]
Revert "Fix memory leak of QFontEngineData"

This reverts commit addffb71b45b5123ee449f0cfa4891dcab044a9f.

The fix causes crashes on exit in Qt Declarative.

Change-Id: Ib1fc67c27fb1869b7824ba080083da67b8878fff
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agochange NSTextInput to NSTextInputClient in Cocoa plugin
Tasuku Suzuki [Sat, 31 Mar 2012 14:22:05 +0000 (23:22 +0900)]
change NSTextInput to NSTextInputClient in Cocoa plugin

NSTextInput protocol is slated for deprecation

Task-number: QTBUG-23867
Change-Id: I3f9eadc31bdf4234c63f1bcde5172f22da8d340e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFixed libjpeg compiler warning about macro redefinition.
Janne Anttila [Mon, 31 Oct 2011 14:02:32 +0000 (16:02 +0200)]
Fixed libjpeg compiler warning about macro redefinition.

When compiling Qt for Windows CE the MSVC reported the followin warning:
    warning C4005: '_CRT_SECURE_NO_DEPRECATE' : macro redefinition
Fixed by adding ifdef quard for duplicate _CRT_SECURE_NO_DEPRECATE.

Task-number: QTBUG-22512
Change-Id: I8c37ffe6ca275c80a7b7e6b23f39f3ab06b332f1
Reviewed-by: aavit <qt_aavit@ovi.com>
(cherry picked from commit 1a1a8f004824b981865c6239747ff05d8e6f812a)