profile/ivi/qtbase.git
12 years agoCompile fix for MinGW.
Friedemann Kleint [Fri, 23 Mar 2012 13:39:08 +0000 (14:39 +0100)]
Compile fix for MinGW.

Change-Id: Id8099668dd1a4b137b6f9451be8617d07bc9d0c3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix warnings in qtbase.
Friedemann Kleint [Fri, 23 Mar 2012 10:34:17 +0000 (11:34 +0100)]
Fix warnings in qtbase.

Change-Id: I981e08872440e35eb9bfad32b20543cfce8439c9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoconfigure: Fix x86_64 arch detection (part 2)
Bradley T. Hughes [Fri, 23 Mar 2012 12:30:40 +0000 (13:30 +0100)]
configure: Fix x86_64 arch detection (part 2)

This is a follow-up to comit 70a88331519e6e6439ff23a9cc91b2e3f607acb6.
The regular expression for CFG_HOST_ARCH was not updated in the above
commit.

Change-Id: I2baf0b42d851f1df096c2f6ad54aeec57940e661
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoMake QEglFSBackingStore use QtGui-only APIs.
Samuel Rødal [Fri, 23 Mar 2012 07:51:15 +0000 (08:51 +0100)]
Make QEglFSBackingStore use QtGui-only APIs.

We now have better replacements for QGLPaintDevice etc.

Change-Id: I3ac563f0ac26a563b3c788d16c77e0237d9d96d9
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoInitial implementation of QQnxServices
Rafael Roquetto [Mon, 19 Mar 2012 16:13:13 +0000 (17:13 +0100)]
Initial implementation of QQnxServices

Extends platform services for QNX devices.

Change-Id: I1eb685cdb38591cd73eaaf40ffb5691db0142953
Reviewed-by: Jeff Kehres <jkehres@rim.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoImplement QSystemTrayIcon for X11.
Friedemann Kleint [Fri, 9 Mar 2012 10:38:55 +0000 (11:38 +0100)]
Implement QSystemTrayIcon for X11.

Reimplement using a QWidget. Use X

Change-Id: I7f8326598fb7210d59bc1d682cdada4526d5b6dd
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove #if 0 sections from QRegExp autotest
Giuseppe D'Angelo [Fri, 23 Mar 2012 05:24:09 +0000 (05:24 +0000)]
Remove #if 0 sections from QRegExp autotest

Use QEXPECT_FAIL instead (QRegExp is bugged w.r.t. the specific
test data).

Task-number: QTBUG-22466
Change-Id: Id5af01fa0d5c0536845fd4db19d4264498a8675b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFix performance problem with NTLM auth in http POST
Shane Kearns [Thu, 22 Mar 2012 15:10:26 +0000 (15:10 +0000)]
Fix performance problem with NTLM auth in http POST

A combination of other fixes resulted in authentication credentials
with a blank username & password being incorrectly added to the
cache only for NTLM.
This caused authentication to be attempted with blank credentials
first (which would fail), before the authenticationRequired
signal was emitted.
It caused a performance issue because of the extra 2 requests to the
server (and possibly delays inserted by the server following a failed
login)

Change-Id: Ic588a20cfe7c24d5e60cd384caff0673a587e484
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoOnly create cmake files if MODULE is set.
Stephen Kelly [Thu, 22 Mar 2012 14:51:16 +0000 (15:51 +0100)]
Only create cmake files if MODULE is set.

WinMain does not set MODULE, though it uses qt_module_config and
generates incomplete cmake files in the wrong locations as a result.

Change-Id: I5081a13a19469ab8cd01970a55684b8451bc79d7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQLocalSocket: remove double buffer on qlocalsocket_unix
Martin Petersson [Thu, 22 Mar 2012 09:39:31 +0000 (10:39 +0100)]
QLocalSocket: remove double buffer on qlocalsocket_unix

The QLocalSocket is using a QLocalUnixSocket which is a QTcpSocket
that has buffering enabled. Because QLocalSocket is a QIODevice it
also has its own read buffer. By opening the QIODevice Unbuffered
we only use the buffer in the QLocalUnixSocket.

Change-Id: I4b9091522f73b0831b20efb4a2a00c2603fc748b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoCheck if Qt::ImEnabled is true before handling im events on Mac
Tasuku Suzuki [Mon, 19 Mar 2012 02:04:26 +0000 (11:04 +0900)]
Check if Qt::ImEnabled is true before handling im events on Mac

Key events were not sent to items on graphics view after the change
412dbdf410c765e75c60d1f48143dd6c02a69493. This is because the change
only checks if QGuiApplication::focusObject() exists. Qt::ImEnabled
needs to be checked too.

Change-Id: I2a78af717a7a1a5d84fbc8b521253bdc25b43286
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: Add window fullscreen button on OS X Lion.
Morten Johan Sorvig [Wed, 21 Mar 2012 13:58:20 +0000 (14:58 +0100)]
Cocoa: Add window fullscreen button on OS X Lion.

Use the heuristic that windows that are not an
NSPanel and has the MaximizedButtonHint get the
fullscreen button.

Change-Id: I9a3520b7e4cd1833421d5d2f5b73da7edbfc3e74
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdd QPA readme.
Morten Johan Sorvig [Thu, 22 Mar 2012 10:21:32 +0000 (11:21 +0100)]
Add QPA readme.

Change-Id: Ibc3a95f3560af909a45d147098184c2194187932
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoconfigure: Fix x86_64 detection
Bradley T. Hughes [Fri, 23 Mar 2012 06:02:47 +0000 (07:02 +0100)]
configure: Fix x86_64 detection

The regular expression should look for underscores in addition to
alphanumeric characters.

Change-Id: Idc3dbd67291ec1420f818d74fba8413b1e7cbcf1
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix udev building after commit 7a169fb52a2d57ec6b3b8e6196e5d4ce084e3eb0
Thiago Macieira [Mon, 5 Mar 2012 17:45:17 +0000 (09:45 -0800)]
Fix udev building after commit 7a169fb52a2d57ec6b3b8e6196e5d4ce084e3eb0

Change-Id: I13fcc6f58376657d54d3c0efd02f5ffba2a79cca
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoDeprecate QInputMethodEvent::setTentativeCommitString()
Pekka Vuorela [Tue, 28 Feb 2012 12:23:36 +0000 (14:23 +0200)]
Deprecate QInputMethodEvent::setTentativeCommitString()

Free form tentative commit proved to require too much fiddling on
rendered text vs. logical content. Needs simpler mechanism.

Change-Id: Ia4e341abf342d25675fd1129efb11094dde410b2
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoWhitespace fix for brace in qstring.cpp
Thiago Macieira [Thu, 22 Mar 2012 14:55:18 +0000 (11:55 -0300)]
Whitespace fix for brace in qstring.cpp

Change-Id: Ia6cf0d2babd931c9ac2a441a9cfec35f2297dddb
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoQuick optimisations to QString: no const-ref for QLatin1XXX
Thiago Macieira [Mon, 17 Oct 2011 22:32:52 +0000 (00:32 +0200)]
Quick optimisations to QString: no const-ref for QLatin1XXX

Change-Id: I2c96adc6ae451f085024464791e53739b2d38bab
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoUse the same ifdef-based debugging as the other engines.
Robin Burchell [Sat, 17 Mar 2012 22:47:22 +0000 (23:47 +0100)]
Use the same ifdef-based debugging as the other engines.

Just so I have a similar workflow all over the place.

Change-Id: I99df5042eac1b4fbf3613f339e8a4522f94ed1f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFixed QLineEdit to emit selectionChanged
Pekka Vuorela [Wed, 21 Mar 2012 14:23:33 +0000 (16:23 +0200)]
Fixed QLineEdit to emit selectionChanged

Was not emitted when removed by input method event.

Change-Id: Ia2c0dcb09d42826188d4612f4c1705a41874a31d
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoFix QPrinter test in Windows
Miikka Heikkinen [Wed, 21 Mar 2012 15:17:42 +0000 (17:17 +0200)]
Fix QPrinter test in Windows

Fixed Q_WS_WIN flagging to Q_OS_WIN in QPrinter API and related
implementation to make API match the documentation and Qt 4.8.
Also Removed the unused internal HDC related functions from the API,
that were previously behind Q_WS_WIN flag.

Some of the properties tested are documented to be valid for native
print engine only in X11 environment, so skipped testing those in
non-xcb environments.

Copy collation is also apparently not supported in Windows native print
engine, though this seems to be undocumented, so skipped that only in
Windows.

At least one of the test blocks in tst_QPrinter::valuePreservation()
failed due to default printer not getting set properly, so fixed that,
too.

Task-number: QTBUG-24191
Task-number: QTBUG-22927
Change-Id: I44a5e3d647a1279fcc7f1e99de6881f9be330246
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoDeprecate QApplication::setGraphicsSystem
Donald Carr [Tue, 20 Mar 2012 11:38:59 +0000 (11:38 +0000)]
Deprecate QApplication::setGraphicsSystem

The QApplication::setGraphicsSystem() call is entirely vestigial after the
QPA rearchitecting of Qt. Deprecate it to give people a heads up that their
original intent no longer has any impact on their application.

Change-Id: I21838431db1057f7f7858b4a434ae0eebd2317de
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake QLocalePrivate::updateSystemLocale() reset the locale data on Unix
Lars Knoll [Mon, 12 Mar 2012 11:40:03 +0000 (12:40 +0100)]
Make QLocalePrivate::updateSystemLocale() reset the locale data on Unix

Reread the environment, and update the locale data on request.

Also fix a small bug where the time format wasn't inherited from
the LANG environment variable if LC_TIME wasn't set.

Change-Id: I619447603ade19d5587b427491cfd9c8fe814858
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMake QLocale not depend on being friends with the global static
Thiago Macieira [Wed, 31 Aug 2011 08:32:41 +0000 (10:32 +0200)]
Make QLocale not depend on being friends with the global static

Don't assume that the global static is a function. Instead, create a
class that is friends.

Change-Id: I992f4d819b367899b19d95b4983e6b243f0ed932
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove the workaround for GCC 3.3 on IRIX
Thiago Macieira [Thu, 29 Dec 2011 14:41:44 +0000 (12:41 -0200)]
Remove the workaround for GCC 3.3 on IRIX

GCC 3.3 is no longer supported. IRIX is no longer supported.

Change-Id: I1656a6fdcf2b244f0f6c812e71b0e793d37fb98b
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoMake architecture detection more robust.
Girish Ramakrishnan [Wed, 21 Mar 2012 04:01:20 +0000 (21:01 -0700)]
Make architecture detection more robust.

Any message/error in mkspecs or qmake feature files ends up confusing
the current arch detection logic. Instead, search for
"Project MESSAGE: .* Architecture: <arch>".

Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix compilation on ARM with C++11: narrowing conversion
Thiago Macieira [Thu, 29 Dec 2011 19:59:01 +0000 (17:59 -0200)]
Fix compilation on ARM with C++11: narrowing conversion

Cannot have double-to-float conversions inside { } in C++11.

Change-Id: I13c27307efd703420b6667d919bb42c2ee82e6cc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix the build of qt-freetype with -system-zlib
Thiago Macieira [Fri, 6 Jan 2012 16:53:38 +0000 (14:53 -0200)]
Fix the build of qt-freetype with -system-zlib

The static library needs to link to zlib too, so that the plugins
using this library link to zlib.

At runtime this doesn't make a difference because -system-zlib means
QtCore is linked to zlib and the system zlib shared library was
loaded, so the symbols are resolved. However, since -Wl,-no-undefined
was added to the build, the plugin must link to zlib explicitly too.

Change-Id: I10d6df8814e823079fee76ae6a7d5b55057c9daf
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix the build of -qt-freetype
Thiago Macieira [Fri, 6 Jan 2012 16:55:55 +0000 (14:55 -0200)]
Fix the build of -qt-freetype

The symbol must be exported from QtGui for the plugins to be able to
see it.

Also, fix the build in namespaced case: cannot use extern in
QtPlatformSupport because it's not compiled into the Qt namespace.

Change-Id: I029533f3524e3cbf6c87aed79c1f2e7b55aebb9b
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix compilation: std::min is in <algorithm>
Thiago Macieira [Sun, 19 Feb 2012 09:02:11 +0000 (10:02 +0100)]
Fix compilation: std::min is in <algorithm>

Change-Id: I89227bb9fca0f081a232c2ede10c4d455edb2ee9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoSave the pkg-config settings in config.status
Thiago Macieira [Tue, 30 Aug 2011 19:42:39 +0000 (21:42 +0200)]
Save the pkg-config settings in config.status

Change-Id: I6fc14eaf071ff56325bbcabb0ae8971fcf07b370
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd a non-implicit virtual destructor for QDashStroker
Thiago Macieira [Thu, 29 Dec 2011 22:11:56 +0000 (20:11 -0200)]
Add a non-implicit virtual destructor for QDashStroker

The base class has a virtual destructor, so the destructor is already
virtual. Make it non-implicit so that the virtual table and other
virtual inline methods don't get emitted everywhere.

Change-Id: I15296c1114086ff0b1da701ccd51525bec99d76b
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd qpair.h to the HEADERS list
Thiago Macieira [Fri, 10 Feb 2012 11:20:07 +0000 (12:20 +0100)]
Add qpair.h to the HEADERS list

Change-Id: I81d078a80b2fba201da9440e3550c2b73adaf668
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove the false information that IA-64 supports SSE2
Thiago Macieira [Tue, 27 Dec 2011 19:38:27 +0000 (17:38 -0200)]
Remove the false information that IA-64 supports SSE2

This must have been a mistake. IA-64 processors used to contain an
IA-32 core, which supported SSE2. However, the IA-64 mode supported no
such thing.

Change-Id: I731c6018166af6b897cb697c68aad4ef3ae93132
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agosupport relative Sysroot specification in qt.conf
Oswald Buddenhagen [Tue, 20 Mar 2012 18:34:41 +0000 (19:34 +0100)]
support relative Sysroot specification in qt.conf

permits relocatable qmake installations in, say, $sysroot/hosttools/.
note that it makes patently no sense to have a relative Prefix when
using a relative Sysroot.

Change-Id: I36e5149acb20a885c3cd244bc9d67aa48b01a56f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomake unspecified/empty HostPrefix fall back to Prefix
Oswald Buddenhagen [Tue, 20 Mar 2012 17:55:28 +0000 (18:55 +0100)]
make unspecified/empty HostPrefix fall back to Prefix

this is needed for backwards-compatibility, and generally makes sense.

Task-number: QTBUG-24839
Change-Id: I42b008a9dfb43cc2ebe49c8baa2c29f5d6a75897
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoMore UTF8 fix of raster autotest
aavit [Wed, 21 Mar 2012 08:50:35 +0000 (09:50 +0100)]
More UTF8 fix of raster autotest

This completes 6c98fd2, for systems where default codec is not UTF8.

Change-Id: I94795785d5d172558c40c06bd3ef4ffaba1624c5
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFixed QScreen::name() return value on xcb.
Samuel Rødal [Thu, 22 Mar 2012 13:14:39 +0000 (14:14 +0100)]
Fixed QScreen::name() return value on xcb.

Previously the primary sceen number wasn't stripped before adding the
actual screen number, resulting in names such as ":0.0.0".

Change-Id: Ifbcf12dcf1c200fd6bc5e4b95a5d82483957e0d2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix assert in libdbus-1 from tst_qdbusmarshall.
David Faure [Wed, 21 Mar 2012 17:24:38 +0000 (18:24 +0100)]
Fix assert in libdbus-1 from tst_qdbusmarshall.

Serializing an empty object path was crashing with
> arguments to dbus_message_iter_append_basic() were incorrect,
> assertion "_dbus_check_is_valid_path (*string_p)" failed in file
> dbus-message.c line 2555.
Thiago says this depends on the libdbus build settings, which is why
it didn't happen to everyone. OpenSUSE-12.1 here.

Change-Id: I657d28d5d915706a22abfd273aad88d20e2d112a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd configure bootstrap generated files to .gitignore
Shane Kearns [Thu, 22 Mar 2012 16:32:39 +0000 (16:32 +0000)]
Add configure bootstrap generated files to .gitignore

Change-Id: Ic538f46eabdf3de96d79c6e2f56627e47933bbab
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoAllow autobound UDP sockets to send to IPv4 and IPv6
Shane Kearns [Thu, 15 Mar 2012 17:58:22 +0000 (17:58 +0000)]
Allow autobound UDP sockets to send to IPv4 and IPv6

When writeDatagram is called without first binding the UDP socket,
then bind it as QHostAddress::Any.
This allows the same socket to be used to sent to both IPv4 and
IPv6 destination addresses.

Allowing the OS to autobind the socket inside sendTo() may
result in a single protocol socket.

Task-number: QTBUG-5275
Change-Id: I2b76507e8a8a38369c6eafb61ce4191d1d6cc930
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoMIPS DSP configure detection and initial blend optimizations.
Damir Tatalovic [Fri, 2 Mar 2012 16:43:52 +0000 (17:43 +0100)]
MIPS DSP configure detection and initial blend optimizations.

Adds new MIPS configure test and -no-mips_dsp and -no-mips_dspr2
configure options.

List of optimized implementations:

- comp_func_SourceOver
- comp_func_Source
- qt_memfill32
- qt_destFetchARGB32
- qt_destStoreARGB32
- blend [RGB32][RGB32]
- blend [ARGB32_Pre][RGB32]
- blend [RGB32][ARGB32_Pre]
- blend [ARGB32_Pre][ARGB32_Pre]

Change-Id: I35411858295b7b3f4895eb56e3b93397528903cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQStandardPaths: implement displayName() on all platforms.
David Faure [Thu, 15 Mar 2012 22:22:34 +0000 (23:22 +0100)]
QStandardPaths: implement displayName() on all platforms.

It was only implemented on Mac OSX until now (all this came from the
QDesktopServices code).

Change-Id: I7fd81d80ca77cf0ca6c213f59813a6163abe7dc5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSignificantly speed up insertion into QJsonObject/Array
Lars Knoll [Tue, 20 Mar 2012 19:45:27 +0000 (20:45 +0100)]
Significantly speed up insertion into QJsonObject/Array

The code was only allocating memory for the next insertion
leading to a reallocation of the whole data for every
single insertion.

The code now reserves some space and uses a decent growth
strategy to avoid repeated reallocs.

Change-Id: I48b0feab71ba8ca73e7037f8460080f198b2f009
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
12 years agoRemove legacy font cache from 3rdparty
Donald Carr [Wed, 21 Mar 2012 14:10:01 +0000 (14:10 +0000)]
Remove legacy font cache from 3rdparty

Change-Id: I5a02251565c0c72e8762c0b41cdf5802c7df1938
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix cross-compilation that uses fontconfig / freetype
Thiago Macieira [Thu, 22 Sep 2011 11:18:11 +0000 (13:18 +0200)]
Fix cross-compilation that uses fontconfig / freetype

config.tests/unix/freetype.pri has a !cross_compile flag, so we must
find freetype using the proper detection methods. The detection was
inside an X11 section of configure, so move that out.

And use the results of that detection, now that QMAKE_CFLAGS_X11 isn't
used (since we're not building X11 in QtPlatformSupport).

Change-Id: Ic8f5cfb7263849bfb12967756def2b5aaa244872
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix the bsymbolic_functions test and improve the error reporting
Thiago Macieira [Tue, 3 Jan 2012 14:10:36 +0000 (12:10 -0200)]
Fix the bsymbolic_functions test and improve the error reporting

The bsymbolic_functions test was missing $SYSROOT_FLAG, so the linking
was always failing and the test falsely negative.

Also make the error reporting better: if the flag was requested, error
out if the check fails and report more information in -v mode.

Change-Id: Ie2615f8083e7e58d63d9ee9c23be937dc864b30d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoUpdate the Linux-ICC mkspec
Thiago Macieira [Mon, 26 Dec 2011 00:46:11 +0000 (22:46 -0200)]
Update the Linux-ICC mkspec

Include linux.conf instead of unix.conf, so it can compile Qt Base
these days (otherwise, we get an error from wayland-scanner.prf).

Remove the outdated information from the header. The mkspec now
matches ICC 12, not 10 and there are more diagnostics we disable.

Change-Id: Ic75593759a4d53f859a9a9e919d77b5c52d01024
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake tst_qmovie work in shadow builds
Thiago Macieira [Wed, 28 Dec 2011 18:47:34 +0000 (16:47 -0200)]
Make tst_qmovie work in shadow builds

Change-Id: I8fe4b5e98ce2fb1ac8420bf568f5c9c973165fbf
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake QNX virtual keyboard handling main event loop driven
Kevin Krammer [Thu, 22 Mar 2012 12:54:00 +0000 (13:54 +0100)]
Make QNX virtual keyboard handling main event loop driven

Refactor from polling in an endless loop running in a separate thread
to using a QSocketNotifier working on the main thread.

Similar to "de-threading" of the navigator event handling in
9dc86ac0f2d019f93665c1ae0e3c2cd33fd88bce

Change-Id: I994dceed07312a3846737c8bea34cffa4ab408f1
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoFix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
Joerg Bornemann [Thu, 22 Mar 2012 14:00:56 +0000 (15:00 +0100)]
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)

Manual merge of the original fix 1ef309e9 in the Qt 4.8 repo.

Task-number: QTBUG-20480
Change-Id: Id08500c2dd16965af3942e65cff1f4afa24180b0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdd x86_64 to CONFIG on Mac OSX only when not cross-compiling
Sean Harmer [Wed, 21 Mar 2012 11:22:28 +0000 (11:22 +0000)]
Add x86_64 to CONFIG on Mac OSX only when not cross-compiling

Change-Id: Idd066010334999376d8b2c9619d797e4eb1f1153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoSet absolute_library_soname on mac only when not cross-compiling
Sean Harmer [Mon, 12 Mar 2012 19:51:52 +0000 (19:51 +0000)]
Set absolute_library_soname on mac only when not cross-compiling

Change-Id: I24a2b70a515483d9d0990f66bff2b37df72faf17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQSql*Model: add SQL syntax helper
Mark Brand [Wed, 14 Mar 2012 09:22:50 +0000 (10:22 +0100)]
QSql*Model: add SQL syntax helper

Change-Id: Ia53e30d7a2f2bb5b4f76c32fcf0fe526d1e4ab51
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoQSqlTM/QSqlRTM: improve style and readability
Mark Brand [Mon, 19 Mar 2012 08:21:55 +0000 (09:21 +0100)]
QSqlTM/QSqlRTM: improve style and readability

General changes:
const, scope, braces, hash[] for clarity, comment wording and
spelling.

QSqlRelationalTableModel::selectStatement() readability:

Renamed private method.

QVector<Class>.value() already defaults to null object value, so there
is no point in handling this case explicitly.

Alias rec for d->rec added more noise than clarity.

Using "tables" list only adds an extra step. Simple concatenation does
the trick.

Deduplicate code for building table expression and JOIN condition.

Change-Id: Ia52afaf3c3937a26595d5ae867982664002562d8
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoQSqlRTM: fix whitespace
Mark Brand [Mon, 19 Mar 2012 07:55:02 +0000 (08:55 +0100)]
QSqlRTM: fix whitespace

Change-Id: I0ed9ab93657d35a0e8c74469f72c77fe1fc4c7c1
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoFixed QInputMethod API to use isVisible() instead of visible().
Samuel Rødal [Mon, 19 Mar 2012 13:05:41 +0000 (14:05 +0100)]
Fixed QInputMethod API to use isVisible() instead of visible().

Deprecate the old API for now as not to break existing usages.

Change-Id: I7abbbbe8a34951282537a9d74cded03743f44df7
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFocusAboutToChange event to be send before focus changes
Pekka Vuorela [Thu, 1 Mar 2012 14:54:50 +0000 (16:54 +0200)]
FocusAboutToChange event to be send before focus changes

Focus change happen as: FocusAboutToChange event -> focus change
-> FocusOut event -> FocusIn event.

Input method need to have focus when calling commit(). Notification
on focus about to be lost allows QWindow implementations to commit in
time.

Also changes QWidget documentation to match code reality.

Change-Id: I17a8a374a33dd700909f79e370b42348869261a6
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoCorrectly export GL graphics engine for use in plugins
Donald Carr [Fri, 16 Mar 2012 00:02:46 +0000 (00:02 +0000)]
Correctly export GL graphics engine for use in plugins

EGLFS and QNX both reference this symbol, hence it needs to be exported

Change-Id: I11b2b8ad5f2b81d951173f7cd8a7fbb8be4bb89b
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake comment() work in the C locale too.
David Faure [Wed, 21 Mar 2012 09:03:26 +0000 (10:03 +0100)]
Make comment() work in the C locale too.

The parser makes the default language en_US, and no mimetype xml says
<comment xml:lang="C">, so use the en_US string for the C locale,
rather than returning an empty string.

Change-Id: Iad7c142e8078abe357773249416e7ce9b3e29a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReturn all expected paths in QStandardPaths::standardLocations
David Faure [Thu, 15 Mar 2012 11:05:58 +0000 (12:05 +0100)]
Return all expected paths in QStandardPaths::standardLocations

ApplicationsLocation and DataLocation were returning only the local path,
rather than system paths + local path.

Change-Id: I653d14e5bbe1e08c5fa1ecd5a6106336d1cd0369
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDon't do anything if setting the same proxy factory.
Xizhi Zhu [Thu, 22 Mar 2012 10:25:51 +0000 (11:25 +0100)]
Don't do anything if setting the same proxy factory.

Otherwise, it crashes if you simply set the same proxy factory instance
twice.

Change-Id: I4b1f1d0eed7630c9a145c0a330c6be1b3fc381e5
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoCocoa: fix setting color with alpha channel value for color dialog
Teemu Katajisto [Thu, 22 Mar 2012 11:27:21 +0000 (13:27 +0200)]
Cocoa: fix setting color with alpha channel value for color dialog

Make sure that if ShowAlphaChannel option is set then also setShowsAlpha
needs to be set for the panel before setting the current color, otherwise
alpha channel value is omitted.

Task-number: QTBUG-24320

Change-Id: Ifb3822711af8ffd0cf6cb4c8aab2b0020d296663
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoUpdate QtXmlPatterns module name in documentation
Honglei Zhang [Wed, 21 Mar 2012 11:35:00 +0000 (13:35 +0200)]
Update QtXmlPatterns module name in documentation

According to new module name convention, QtXmlPatterns is
replaced with Qt XML Patterns in all documentation.

Task-number: QTBUG-24775

Change-Id: I9ca85728e266bd1ca9fa7a14e5e68c43c8d3e826
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoNeed to check new rotation against initial rotation instead of current
Kevin Krammer [Wed, 21 Mar 2012 12:01:55 +0000 (13:01 +0100)]
Need to check new rotation against initial rotation instead of current

Only swap width/height of initial geometry if orthogonal to initial
rotation not orthogonal to current rotation

Change-Id: I825954e98dee6c0d07a284307dfb8e1f9fd538e6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
12 years agoShow correct origin of Q_ASSERT in Windows dialog
Kai Koehne [Wed, 21 Mar 2012 09:15:01 +0000 (10:15 +0100)]
Show correct origin of Q_ASSERT in Windows dialog

Display the actual file and line where the Q_ASSERT statement
was triggered.

Change-Id: I54d72f4c4bd9edee744c0f6e08f31b8e3120f454
Reviewed-by: David Faure <faure@kde.org>
12 years agoRemove redundant \since 5.0
Debao Zhang [Thu, 22 Mar 2012 04:57:26 +0000 (21:57 -0700)]
Remove redundant \since 5.0

\since 5.0 has been add to the class section, so member functions and
properties donot need this any more.

see SHA: 5728c8a8e7c994b931d340315c241350d646f62a

Change-Id: I4e67461373dda99ee1fbfdeb6477fde1dcfec116
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFixed path in qobject unittest
Kurt Korbatits [Thu, 22 Mar 2012 03:07:29 +0000 (13:07 +1000)]
Fixed path in qobject unittest

- Fixed path was failing to find sub program.

Change-Id: I86f1a6941e244c9bc25ad0441cc7a441607560b7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged installTestHelperApp() to use relative paths to build
Kurt Korbatits [Thu, 22 Mar 2012 02:46:19 +0000 (12:46 +1000)]
Changed installTestHelperApp() to use relative paths to build

- Changed installTestHelperApp() to use OUT_PWD path to find files.
  (was looking in source tree instead of build)

Change-Id: If795c17a76aebcfbbe0d4f84c5df784a255ddb19
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse delete[] instead of delete.
Sergio Martins [Thu, 15 Mar 2012 11:10:39 +0000 (11:10 +0000)]
Use delete[] instead of delete.

Change-Id: Idfa039a56ce0f7af92e91ec1657d91c79c400d6c
Reviewed-by: David Faure <faure@kde.org>
12 years agoAdded extra tests to json benchmark
Kurt Korbatits [Mon, 19 Mar 2012 04:54:16 +0000 (14:54 +1000)]
Added extra tests to json benchmark

- Added toByteArray() and fromByteArray() benchmark tests.
  Performance tests to measure QVariantMap to bytearray
  and bytearray to QVariantMap.
  Use case: Interprocess communications via local socket

Change-Id: If5e94ff870890b2ebb665f3cc38f5c33b34547f4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQDoc: updating manual to use "type".
Jerome Pasion [Wed, 21 Mar 2012 11:22:19 +0000 (12:22 +0100)]
QDoc: updating manual to use "type".

-updated both QDoc manual and QDoc guide
-"QML element" and "QML component" should be "QML type"

Change-Id: Ib2a0e8baa9087a04d35c05bbbd35852da10faf42
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Disable generation of .pageindex file.
Casper van Donderen [Wed, 21 Mar 2012 12:28:25 +0000 (13:28 +0100)]
qdoc: Disable generation of .pageindex file.

The .pageindex file was generated for the search engine on the
doc.qt.nokia.com website, since this website is not used anymore there
is no use for the .pageindex file.

Task-number: QTBUG-24911
Change-Id: Ie74f569ce881ab383d83ac9c5a8bc223da91564a
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoUse main thread event loop for navigator event processing
Kevin Krammer [Tue, 20 Mar 2012 10:27:52 +0000 (11:27 +0100)]
Use main thread event loop for navigator event processing

Removes the need for an extra thread by creating the event handler's
socket notifier in the context of the main thread.

Change-Id: If8c7bb986074083b5b9a7b9c96734a970ba32f92
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoRemove Q_WS_X11
Frederik Gladhorn [Thu, 15 Mar 2012 14:16:43 +0000 (15:16 +0100)]
Remove Q_WS_X11

The define is removed and only adds includes.

Change-Id: Id6cc32aa22536f78bb5de10cb779a3168e79441a
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoFix QWidgetTextController issue when used with QtQuick1 TextEdit
Pekka Vuorela [Tue, 20 Mar 2012 16:52:50 +0000 (18:52 +0200)]
Fix QWidgetTextController issue when used with QtQuick1 TextEdit

Calling QInputMethod::invokeAction() was not checking for proper event
type and was requiring context widget unnecessarily.
Fixes some parts of QTBUG-24035

Change-Id: I51fe9ed02a018ced36319eb672a088503649b275
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoFix directories never being unwatched after deletion on Windows.
Robin Burchell [Sat, 17 Mar 2012 22:28:48 +0000 (23:28 +0100)]
Fix directories never being unwatched after deletion on Windows.

This causes all sorts of problems, but is also blocking the introduction of new,
more detailed signals, because the backend never correctly identified the removal.

The object handle appears to be woken up before the directory is actually
deleted, thus causing QFileInfo::exists() to return true, and not doing the
removal dance. This behaviour isn't exactly documented (as far as I was able to
find out), but also seems to happen consistently, and Chromium also contains
a comment noting a similar issue.

Task-number: QTBUG-2331
Change-Id: Icfb6219b78e688852d7863a666a0ffc31bb4d573
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCocoa: improve mouse button tracking warnings
Bradley T. Hughes [Wed, 21 Mar 2012 10:08:14 +0000 (11:08 +0100)]
Cocoa: improve mouse button tracking warnings

The warnings about "Internal mouse button tracking invalid" should check
for the correct button before emitting a warning. The warning should
also mention the correct button as well. For otherMouseDragged, we
simply check for any button that's not the left or right button.

Change-Id: I9eb6d6bd7fb5919e745b7f8eb517b4bc9efd36a6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: Improve window activation handling.
Morten Johan Sorvig [Wed, 21 Mar 2012 07:47:16 +0000 (08:47 +0100)]
Cocoa: Improve window activation handling.

Make Qt window activation follow the Cocoa key
window, with one exception: Popup windows become
the key window but not the Qt active window.

Change-Id: Ic4d8685737fa3ec5c15a68b81844929370c9cd8e
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoQDoc: Changing "element" string to "type".
Jerome Pasion [Wed, 21 Mar 2012 09:30:01 +0000 (10:30 +0100)]
QDoc: Changing "element" string to "type".

-QDoc output should use "type", not "element".
"This type was introduced..."

Change-Id: I72b6ba6318889d7727796b80574b72694f2b7594
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agopermit explicitly empty qt.conf entries
Oswald Buddenhagen [Tue, 20 Mar 2012 18:18:51 +0000 (19:18 +0100)]
permit explicitly empty qt.conf entries

this allows expressing "no SettingsPath" cleanly, and makes the
internals cleaner.

this is marginally behavior-incompatible in that if somebody had Prefix
or Data set to an empty string (rather than a dot, which is hinted at by
the documentation and commanded by common sense), he would have gotten
the binary's directory resp. Prefix, while now it will be just empty.

Change-Id: I3c11cc4e8671ffb604d4889389764a9ba9c2e7e6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoRemove hardcoded font names in QFont::defaultFamily()
Jiang Jiang [Tue, 20 Mar 2012 10:57:35 +0000 (11:57 +0100)]
Remove hardcoded font names in QFont::defaultFamily()

QFont::defaultFamily() should not use any hardcoded font names like
"Helvetica" or "Times" as they might not be present in certain systems,
it should rather use abstract names like "sans-serif", "serif" and
"monospace" then let the platform plugin to decide which font map to
them.

Change-Id: I5aafb103a5238c17b10773711ad504806c6fc3ce
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoCocoa: Implement screen availableGeometry.
Morten Johan Sorvig [Fri, 16 Mar 2012 13:26:15 +0000 (14:26 +0100)]
Cocoa: Implement screen availableGeometry.

As usual the y coordinate needs to be inverted.

Change-Id: Iac9b48f9bdb475a3d5a76b930c2e138a625f1ef8
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoCocoa: fix inactive palette text color
Bradley T. Hughes [Tue, 20 Mar 2012 09:53:45 +0000 (10:53 +0100)]
Cocoa: fix inactive palette text color

The QPalette::Inactive text color should be the same as
kThemeTextColorDialogActive. kThemeTextColorDialogInactive is for
disabled widgets/windows.

Change-Id: I55eb63fff213cb9870a991455cbc3254b9d1538e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: fix crash when using QPrintDialog
Bradley T. Hughes [Tue, 20 Mar 2012 08:18:30 +0000 (09:18 +0100)]
Cocoa: fix crash when using QPrintDialog

The contextInfo passed to printPanelDidEnd should be a QPrintDialog*,
not a QPrintDialogPrivate*.

Change-Id: I8f9aae2f27b483b4669f9d39cdafd0ddeb37fd22
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoEGLFS: Integrate building into configure.
Donald Carr [Wed, 7 Mar 2012 14:07:07 +0000 (14:07 +0000)]
EGLFS: Integrate building into configure.

With the move to the QPA architecture EGL is now only required by
individual platform plugins and the configure script has been adjusted to
reflect this.

Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoAvoid Qt/X11 header contamination via egl.h
Donald Carr [Mon, 19 Mar 2012 13:45:42 +0000 (13:45 +0000)]
Avoid Qt/X11 header contamination via egl.h

egl.h on certain platforms directly includes X11 headers, resulting in an
all too familiar header conflict. There are existing defines we merely need
to set in order to avoid this eventuality.

Change-Id: Ic91b66286ad6cc329f9c88b5e47834690a8eb96a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd egl include paths and link lines to eglfs.
Girish Ramakrishnan [Sat, 17 Mar 2012 00:07:42 +0000 (17:07 -0700)]
Add egl include paths and link lines to eglfs.

This is the equivalent of 821fc4cf4e520a74b8d4c834f2fb46e4e2f27001
from qt4 but done differently because qt5 has egl.prf.

Change-Id: I52114239bdeda6c300db04a7859cae52aa9e9b41
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix a typo in QFontconfigDatabase
Jiang Jiang [Tue, 20 Mar 2012 08:56:00 +0000 (09:56 +0100)]
Fix a typo in QFontconfigDatabase

Font family names for default families (Serif, Sans serif, Monospace)
was only taken from the first family in the array (aka. always Serif).

Change-Id: Ia326dc85e03819f1a72deda66aade348809d94da
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix GPOS positioning for some fonts
Eskil Abrahamsen Blomfeldt [Tue, 20 Mar 2012 11:01:22 +0000 (12:01 +0100)]
Fix GPOS positioning for some fonts

We need to do ACCESS_Frame for each 2 byte frame, otherwise
the position of the cursor in the input stream will not be
updated by enough, and we will read twice as many pairsets.
Depending on the value read for the SecondGlyph in the
broken pairsets, we might get strange kerning results.

Change-Id: I7fb5a850afe0364b3dd50869d5f36fd14d2f4eaf
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
12 years agoSet the default QPA plugin for QNX builds to "qnx"
Sean Harmer [Tue, 20 Mar 2012 14:07:39 +0000 (14:07 +0000)]
Set the default QPA plugin for QNX builds to "qnx"

Change-Id: I630c3631d480929c1e3a618d0f0b084fd2cc6ad0
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix stltest compilation
Giuseppe D'Angelo [Fri, 16 Mar 2012 21:48:31 +0000 (21:48 +0000)]
Fix stltest compilation

The usage of std:ptrdiff_t in the test requires the #inclusion of
the cstddef header.

Task-number: QTBUG-24828
Change-Id: I7e1ca6ee010469708f8da1709563b5ebced972e5
Reviewed-by: Anssi Eteläniemi
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove old bic test data
Marius Storm-Olsen [Tue, 20 Mar 2012 14:16:15 +0000 (15:16 +0100)]
Remove old bic test data

We will not be testing BIC of Qt5 against Qt4

Change-Id: I6f0eea3dd60eea1535749240a178a19605c981d0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRevert "Remove the LIBS from platformsupport"
Samuel Rødal [Tue, 20 Mar 2012 08:17:18 +0000 (09:17 +0100)]
Revert "Remove the LIBS from platformsupport"

This reverts commit cd6e90c70ac13065257422088ffa01537ed9c685.

Prevent symbol lookup error when requesting alpha visuals with GLX in
the xcb plugin. This means other plugins will also link against
-lXrender, but we need this workaround for now.

Change-Id: I2fd2c63bc577c2497060a555c91d72337723b931
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoqdoc: Handle multiple \ingroup commands in QML types.
Martin Smith [Tue, 20 Mar 2012 13:08:25 +0000 (14:08 +0100)]
qdoc: Handle multiple \ingroup commands in QML types.

These were not handled in the QmlVisitor class.
It was believed they would appear as separate
commands in QmlVisitor, but the appear as one
\ingroup command followed by several group
identifiers.

Change-Id: If198433f7cd5095264f41346987c49ee4c30a786
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Remove short description from apiDesc
Martin Smith [Mon, 19 Mar 2012 11:20:20 +0000 (12:20 +0100)]
qdoc: Remove short description from apiDesc

The XSLT already adds this from the <shortdesc>.

Change-Id: I5813bf668f9b198e6b76bc0af8f26c7a910890fb
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Remove the spectitle attribute
Martin Smith [Mon, 19 Mar 2012 09:54:15 +0000 (10:54 +0100)]
qdoc: Remove the spectitle attribute

qdoc no longer writes the title as the value of the
spectitle attribute in the <apiDesc> element.

Change-Id: I3f89142fa764c9ac2f3f3bcf9d9162bcf3528df2
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Enable XSLTs to produce correct #include info.
Martin Smith [Mon, 19 Mar 2012 09:31:27 +0000 (10:31 +0100)]
qdoc: Enable XSLTs to produce correct #include info.

qdoc no longer writes the expected "include" statment
in a codeblock in the detailed description. It writes
it as an <othermeta> element in the <prolog> instead.

Change-Id: I303477dbba7f2383fb374a398c890760a15744de
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Rename qt3 support pages to Compatibility pages.
Casper van Donderen [Mon, 19 Mar 2012 12:26:55 +0000 (13:26 +0100)]
qdoc: Rename qt3 support pages to Compatibility pages.

Task-number: QTBUG-24849

Change-Id: I9453e38372f909d75bb4fb8642dc9bd7b993aa7e
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoNotifier signals don't need separate documentation.
Casper van Donderen [Mon, 19 Mar 2012 17:52:56 +0000 (18:52 +0100)]
Notifier signals don't need separate documentation.

Similar to getters and setters, notifier signals don't need separate
documentation.

Reimplementation of http://codereview.qt-project.org/#change,19374 in
qtbase.

Change-Id: If77fc554a3d8c1b520940d23e17cb7f76a71660f
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>