profile/ivi/qtbase.git
12 years agoClean up src.pro
Donald Carr [Tue, 6 Mar 2012 22:12:18 +0000 (22:12 +0000)]
Clean up src.pro

Removing (some) stale assumptions about dependencies from src.pro file

Change-Id: I713e3ad8c164321ef035e6c62b25e18e45d1d3ef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoInput method on Mac
Tasuku Suzuki [Wed, 29 Feb 2012 04:32:20 +0000 (13:32 +0900)]
Input method on Mac

Restore input method implimentation in Qt4

Task-number: QTBUG-23867
Change-Id: I5d405ccc8b0a73c399d992f6474a0cc38d191157
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCheck for PKG_CONFIG_LIBDIR when cross compiling.
Girish Ramakrishnan [Fri, 9 Mar 2012 22:39:14 +0000 (14:39 -0800)]
Check for PKG_CONFIG_LIBDIR when cross compiling.

When cross-compiling, check for PKG_CONFIG_LIBDIR instead of
PKG_CONFIG_PATH. pkg-config searches for pc files in PKG_CONFIG_PATH
*and* the compiled in defaults (/usr/lib/pkgconfig). This means that
pc files from the host get found when cross-compiling.

Setting PKG_CONFIG_LIBDIR makes pkg-config search only in the path
set in PKG_CONFIG_LIBDIR.

Documented in the url below:
http://www.freedesktop.org/wiki/Software/pkg-config/CrossCompileProposal

Change-Id: I22dbf29c5691572b7cb8a5fce712ae7ba811670e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMove tst_qshortcut.cpp to QtWidgets
Debao Zhang [Sat, 10 Mar 2012 02:28:12 +0000 (18:28 -0800)]
Move tst_qshortcut.cpp to QtWidgets

QShortcut belongs to QtWidgets instead of QtGui.

Change-Id: I9715399bb372a6ea4bd76109f87ba31a1e30a7e6
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWorkaround webkit deadlock on macos x
Shane Kearns [Tue, 21 Jun 2011 13:50:08 +0000 (14:50 +0100)]
Workaround webkit deadlock on macos x

The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.

Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.

Reviewed-by: Laszlo Agocs
(cherry picked from commit 38db40d9a2db44e47b0aabd9487284cd1106b353)
Task-number: QTBUG-24554

Change-Id: Id2c7818faefb46e66b0bbc30ce30595d46d53016
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
12 years agoRemove redundant wayland stuff from QtBase
Jørgen Lind [Mon, 12 Mar 2012 11:04:54 +0000 (12:04 +0100)]
Remove redundant wayland stuff from QtBase

Config checks are done in the module.

We pick up the pkg-config stuff also in the module. There shouldn't be a
need to do this in configure anyway

Change-Id: I9ef73760511c6b684c6cd5dd13e7e581c588e7aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRe-add the Systray example.
Friedemann Kleint [Fri, 9 Mar 2012 08:40:57 +0000 (09:40 +0100)]
Re-add the Systray example.

Remove its dependency on QtSvg by converting the icons to
(optimized) png files.

Change-Id: If63257938dc816d7ab76a3042b9ac88ef3d51b07
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindows: Implement QWindowsIntegration::queryKeyboardModifiers()
Friedemann Kleint [Mon, 12 Mar 2012 16:16:35 +0000 (17:16 +0100)]
Windows: Implement QWindowsIntegration::queryKeyboardModifiers()

Use code from Qt 4.8.

Change-Id: I32d220e04d13ee1e692c0c58268b827bcf519dc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoImplement QSystemTrayIcon for Windows.
Friedemann Kleint [Fri, 9 Mar 2012 08:53:10 +0000 (09:53 +0100)]
Implement QSystemTrayIcon for Windows.

No longer base the implementation on a QWidget which is not
necessary when all that is required is a message window listening
to task-tray messages. Export a service function creating a message
window from the Windows native interface and use that.

Task-number: QTBUG-20978

Change-Id: I01d0faeac777df4eee802c51d2bc722fce814080
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoDon't define QT_NO_CORESERVICES on all platforms. That's just annoying
Jørgen Lind [Mon, 12 Mar 2012 11:16:13 +0000 (12:16 +0100)]
Don't define QT_NO_CORESERVICES on all platforms. That's just annoying

Change-Id: Id814bd0956b97c84ff0e6fcae8e5f22394c433e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix the QMAKE_LIBS_WAYLAND variable
Jørgen Lind [Mon, 12 Mar 2012 11:48:20 +0000 (12:48 +0100)]
Fix the QMAKE_LIBS_WAYLAND variable

This variable is there for documentation, but its not being used anymore.
There are two libraries from wayland, libwayland-client and
libwayland-server. Add two variables that will be picked up in the
QtWayland module.

Change-Id: I16219092a4ed2e48080921ce39f61192b6abb711
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMove the auto test of QPixmap::grabWidget() from QPixmap to QWidget
Debao Zhang [Fri, 9 Mar 2012 00:48:17 +0000 (16:48 -0800)]
Move the auto test of QPixmap::grabWidget() from QPixmap to QWidget

Change-Id: Id565fa1eb8fe13c62a93a5afa39a5701ce7b20ea
QPixmap::grabWidget is deprecated, which calls QWidget::grab() at present.
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQRegularExpression: add error strings for translation
Giuseppe D'Angelo [Mon, 23 Jan 2012 23:09:51 +0000 (23:09 +0000)]
QRegularExpression: add error strings for translation

Added the error strings from PCRE to be picked up by lupdate,
to enable translations.

Change-Id: Iaeabde5d7a17f9a0273511e0741e67a097d23a98
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDo not add -rpath-link directives with no library path
Sean Harmer [Mon, 12 Mar 2012 11:03:47 +0000 (11:03 +0000)]
Do not add -rpath-link directives with no library path

Doing so works fine on Linux as g++ version there silently ignores
this. However, the qcc toolchain for QNX barfs.

Change-Id: Ia236910adc09dc1653e4169e20476b69c2de62ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agotst_exceptionsafety_objects: add virtual ~AbstractTester
Marc Mutz [Tue, 6 Mar 2012 11:14:51 +0000 (12:14 +0100)]
tst_exceptionsafety_objects: add virtual ~AbstractTester

GCC complained about undefined behaviour when
deleting subclasses of AbstractTester through
pointers to AbstractTester, and it's doing so
correctly...

Change-Id: Ie641281d8aafe32c5c9784e8aa39672ff0b699c7
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdd documenation about QAccessibleStateChange event.
Frederik Gladhorn [Wed, 7 Mar 2012 15:27:47 +0000 (16:27 +0100)]
Add documenation about QAccessibleStateChange event.

Change-Id: Iea34d71d71a6dd58f761722ce20ae8ec2b81ae58
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoUse QAccessibleEvent in test.
Frederik Gladhorn [Wed, 7 Mar 2012 15:21:38 +0000 (16:21 +0100)]
Use QAccessibleEvent in test.

Change-Id: I4f9c0f503543caa5704a29c8ccd7c4134b455625
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoRemove stale references to Qtopia
Donald Carr [Fri, 9 Mar 2012 00:59:37 +0000 (00:59 +0000)]
Remove stale references to Qtopia

Change-Id: Idd9b5fae8f6a0273636a878325e82e5664a40d43
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDelete QPlatformDragPrivate object in QPlatformDrag's destructor
jian liang [Thu, 1 Mar 2012 16:07:49 +0000 (00:07 +0800)]
Delete QPlatformDragPrivate object in QPlatformDrag's destructor

Change-Id: Ib722df14123b24ca044f6e0846aa1435c7e0e201
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQSqlTableModel::indexInQuery: fix inserted row accounting
Mark Brand [Wed, 7 Mar 2012 23:19:03 +0000 (00:19 +0100)]
QSqlTableModel::indexInQuery: fix inserted row accounting

Commit b979956ec46093e5668c2b264f9b68da3cbb0326 introduced a
distinction between rows that have a pending INSERT operation and
rows that have already been inserted in the database but still are
in the change cache. Both cases are rows that are not in the underlying
query. Unfortunately, we overlooked a case where the point of the test
is whether the row is in the query.

Change-Id: I0f58bed232d9336fed6e67c3d140fd580ec35868
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoHarfbuzz GPOS hinting- do not consider a subtable to be invalid if it is just empty
John Tapsell [Thu, 8 Mar 2012 23:10:30 +0000 (23:10 +0000)]
Harfbuzz GPOS hinting- do not consider a subtable to be invalid if it is just empty

Considering a subtable to be invalid when it was empty meant that it
returned an error causing all further hinting to be aborted.  This means
that we get no hinting in certain cases with certain fonts.

Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d
Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoLine up underlines if fallback fonts are used (QTBUG-21832)
Stefan Hundhammer [Thu, 1 Mar 2012 16:14:38 +0000 (17:14 +0100)]
Line up underlines if fallback fonts are used (QTBUG-21832)

Change-Id: Icecc514f6c47c0576af8cabd39cdc0987f8d93fa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix indentation of QWaitCondition autotest.
Jason McDonald [Fri, 9 Mar 2012 04:11:26 +0000 (14:11 +1000)]
Fix indentation of QWaitCondition autotest.

No functional changes - cosmetic change only.

Change-Id: I7332eaab31720776c70a7ef813d55db44bab83f7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove MSVC 6 workaround from QtConcurrent.
Jason McDonald [Fri, 9 Mar 2012 03:56:03 +0000 (13:56 +1000)]
Remove MSVC 6 workaround from QtConcurrent.

MSVC 6 is not supported by Qt 5.

Change-Id: I2aef026eb2ad6a68cd9bcddcf6578cb1a019b21c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove gcc 3.x-specific code from QtConcurrent and its tests.
Jason McDonald [Fri, 9 Mar 2012 03:50:19 +0000 (13:50 +1000)]
Remove gcc 3.x-specific code from QtConcurrent and its tests.

Change-Id: I4dd0ce50b70a47a0a00f4c7ec18077a1bcbe5705
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd a movable type declaration to QGlyphRun.
Andrew den Exter [Fri, 9 Mar 2012 02:25:31 +0000 (12:25 +1000)]
Add a movable type declaration to QGlyphRun.

Allow it to take advantage of QList optimisations for pointer types.

Change-Id: Iddbb9741efef43604e38fc3eeb08b522c0414e21
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoqdoc: Fix closing 'table class="generic"' tag
Sergio Ahumada [Mon, 12 Mar 2012 11:06:39 +0000 (12:06 +0100)]
qdoc: Fix closing 'table class="generic"' tag

Change-Id: I251ed6d4e5788b0816211e06f33ace03d2fa14e8
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoConvert xlib plugin to new format
Debao Zhang [Sun, 11 Mar 2012 00:17:27 +0000 (16:17 -0800)]
Convert xlib plugin to new format

Change-Id: I00418a1eb7bf944ec360dbbb1f61f7703f3ecd37
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove Mac multiple-arch support.
Morten Johan Sorvig [Tue, 21 Feb 2012 12:02:24 +0000 (13:02 +0100)]
Remove Mac multiple-arch support.

Change-Id: Iaad361301e4772c3d8be6186da88e494cb234801
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoCocoa: Fix accessiiblityPerformAction
Morten Johan Sorvig [Mon, 23 Jan 2012 13:55:48 +0000 (14:55 +0100)]
Cocoa: Fix accessiiblityPerformAction

Remove hardcoded pressAction();

Change-Id: Ie02e3f2f88a2cd311aec1b39daa160efb3b2b617
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoRename blackberry QPA plugin to QNX
Sean Harmer [Fri, 9 Mar 2012 17:21:22 +0000 (17:21 +0000)]
Rename blackberry QPA plugin to QNX

Changing the naming scheme from Blackberry to QNX in line with pattern
of using platform names.

Change-Id: I048a6a18010bc932311d63c8dde19ccab97894c8
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
12 years agoRemove QAccessible2::TableModelChange.
Frederik Gladhorn [Wed, 7 Mar 2012 19:48:06 +0000 (20:48 +0100)]
Remove QAccessible2::TableModelChange.

This was never a good idea since it has issues:
It doesn't really work with more than one update without
the client fetching the data. The same is unlikely to work reliable
since it involves two ipc roundtrips.

Instead we should have an extended QAccessibleEvent that contains
the data so that the bridges can decide how to pass on the data if
needed.

Change-Id: Iaf6b74f49586f7155909a6fe1a17137b71b31175
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoMove tst_qprinter.cpp to QtPrintSupport
Debao Zhang [Sat, 10 Mar 2012 02:43:21 +0000 (18:43 -0800)]
Move tst_qprinter.cpp to QtPrintSupport

QPrinter and QPrinterInfo belong to QtPrintSupport.

Change-Id: I0c146e0c717be365e752c1eaf7dbe6765fb72da2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoClean up some auto tests of gui
Debao Zhang [Sat, 10 Mar 2012 02:09:17 +0000 (18:09 -0800)]
Clean up some auto tests of gui

These unit tests do not depent on QtWidget.

Change-Id: I95526125c563885c0531da7ebfee06bca9a87b1c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUpdate accessibility StateChange by custom event.
Frederik Gladhorn [Wed, 7 Mar 2012 12:51:31 +0000 (13:51 +0100)]
Update accessibility StateChange by custom event.

Subclass QAccessibleEvent to give details what changed in the
state change.

Change-Id: I9005d311e85a3c8bfa6e062833fa6a8a7dc6a4a4
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoRemove unnecessary function.
Casper van Donderen [Mon, 12 Mar 2012 09:48:44 +0000 (10:48 +0100)]
Remove unnecessary function.

The reconstituteFieldMemberExpression static function was not usedf
anywhere.

Change-Id: Ide23045d7f7c3194a9725ae658df85562ba29ad5
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoMigrate QWindowSystemInterface to use QElapsedTimer
Laszlo Agocs [Fri, 9 Mar 2012 12:26:43 +0000 (14:26 +0200)]
Migrate QWindowSystemInterface to use QElapsedTimer

Change-Id: I7dfb0590dce79678d49f5d6ef8f60758719bcf72
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agosanitize install target names
Oswald Buddenhagen [Sat, 10 Mar 2012 09:04:04 +0000 (10:04 +0100)]
sanitize install target names

qmake uses the variable name verbatim, which makes the generated
makefile look "interesting" without this cleanup.

Change-Id: If6c4f12563a0ee6429513fbfac534f40bb7c0b97
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAllow qmake to find features when using mkspecs in nested dirs
Sean Harmer [Tue, 6 Mar 2012 18:05:27 +0000 (18:05 +0000)]
Allow qmake to find features when using mkspecs in nested dirs

Commit 8e5eb1bddcfc introduced the assumtion that mkspecs are
immediately below the mkspecs directory itself. This is not true for
e.g. unsupported/blackberry-armv7le-qcc.

This commit restores qmake's ability to find the "root" of the mkspecs
collection no matter how deeply the actual mkspecs are nested.

Task-number: QTBUG-24665
Change-Id: I98faaf8e6ae7b8524277aea6c17e685e507e37b3
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw
Oswald Buddenhagen [Fri, 9 Mar 2012 18:11:27 +0000 (19:11 +0100)]
QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw

this makes the "sysrootable" properties more magic, with the raw
versions being omitted from the qmake -query output and automatically
falling back to the "cooked" variant if there is no sysroot set.

this makes the "normal" qmake -query less noisy. this will become even
more obvious when i add more "overloads" of the properties.

Change-Id: I08000986427264ec6238c8fe0a77f5cecdbf1201
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agorip out -incremental from configure
Oswald Buddenhagen [Fri, 2 Mar 2012 18:30:00 +0000 (19:30 +0100)]
rip out -incremental from configure

the feature is rather obscure and unlikely to be used by anyone.

Change-Id: I2dfb4ca4d5d1f210d385c013f46bc6389fd6ea2d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoUpdate qnx mkspecs to not use fixed tool paths
Sean Harmer [Sun, 11 Mar 2012 12:14:43 +0000 (12:14 +0000)]
Update qnx mkspecs to not use fixed tool paths

This changeset allows Qt to be built for QNX platforms in light of
commit d59e85d9095f5d8fa787149fe8d34e8dfac0a0b5.

Change-Id: Idf8e89cf1b0a5625ef7ee6397c223137fa151cdc
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRestore some source compatibility
Lars Knoll [Sat, 10 Mar 2012 22:51:31 +0000 (23:51 +0100)]
Restore some source compatibility

Add an implicit #include back in to avoid
needless SC and compilation breaks.

Add some deprecated method for codecForTr, until
all other modules are ported to mot use it anymore.

Change-Id: I5334b47a0c32819b9eb6b7203cc98ce4e6073a64
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoMove tst_qicon.cpp and tst_qpixmapfilter.cpp to QtWidgets
Debao Zhang [Fri, 9 Mar 2012 00:05:03 +0000 (16:05 -0800)]
Move tst_qicon.cpp and tst_qpixmapfilter.cpp to QtWidgets

QIcon and QPixmapFilter belong to QtWidgets instead of QtGui.

Change-Id: I6d82811e04046edb0cc67c55970c161612e86d3f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSupport Growl >=1.3 in QSystemTrayIcon
Vincent A [Wed, 7 Mar 2012 18:24:29 +0000 (19:24 +0100)]
Support Growl >=1.3 in QSystemTrayIcon

The app name has changed in Growl 1.3, but the id
stays the same. Also don't send notifications if
Growl is not running to follow recommendations.

Change-Id: I31ff7df272b4af1b4f1e4db80c47e7ba75038dec
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoRemove outdated assumption from QVariant autotest.
Jason McDonald [Thu, 8 Mar 2012 05:52:03 +0000 (15:52 +1000)]
Remove outdated assumption from QVariant autotest.

The test was assuming that "data()" is a special function in autotests,
but that hasn't been the case since early prototypes of testlib.

Change-Id: Ic24cf5dc539b55d12eba0a6ab17173e2ed698f21
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix compile warnings in QCoreApplication autotest.
Jason McDonald [Thu, 8 Mar 2012 06:20:31 +0000 (16:20 +1000)]
Fix compile warnings in QCoreApplication autotest.

- Use const_cast to avoid "deprecated conversion from string constant to
  'char*'" warning when building argv arrays from string literals.
- Use Q_UNUSED to avoid warnings on unused local variables.

Change-Id: Idd2c8279adc102b6ebc6af7486ba26fe9ed4e7c1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoForce properties to be applied in the order in which they are specified.
Robin Burchell [Mon, 5 Mar 2012 14:05:16 +0000 (15:05 +0100)]
Force properties to be applied in the order in which they are specified.

Previously, property setting was randomized in order, which means that things
like: qproperty-foo: 4; qproperty-bar: 5; where foo may affect bar worked by
chance - or not at all - depending on the hash function.

Change-Id: Ifb9813ee72842cefb278cbedb644f24b91113f3f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove redundant and incorrect comment from QList autotest.
Jason McDonald [Thu, 8 Mar 2012 05:48:23 +0000 (15:48 +1000)]
Remove redundant and incorrect comment from QList autotest.

Change-Id: I3187d0d8ace120181a4c49bbc68f421ddf5acbe0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agotestlib: Improve formatting of QCOMPARE failure messages.
Jason McDonald [Thu, 8 Mar 2012 01:30:10 +0000 (11:30 +1000)]
testlib: Improve formatting of QCOMPARE failure messages.

Make the various versions of the failure message align consistently so
that it's a little easier to compare the actual and expected values.  Of
course, the value won't align nicely unless the "actual" and "expected"
strings are the same length, but at least this commit makes that
consistent across all versions of the message.

Change-Id: If9ce231df3b5d279a06f6458fdb5da0aa4586068
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd Q_IS_ENUM(), and provide as flag in QMetaType::typeFlags()
Glenn Watson [Tue, 7 Feb 2012 02:25:07 +0000 (12:25 +1000)]
Add Q_IS_ENUM(), and provide as flag in QMetaType::typeFlags()

Add Q_IS_ENUM() macro to determine if a given type is an
enumeration. Use information from that in QMetaType::registerType()
to store whether custom registered metatypes are enums or not.
This information can then be accessed by calling
QMetaType::typeFlags(int type). This is used by the declarative
code to determine whether a custom type in a variant can be safely
cast to an integer, which is required to allow passing non-local
enums as signal/slot params.

Change-Id: I9733837f56af201fa3017b4a22b761437a3c0de4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoCrash fix in QMetaType::typeFlags.
Jędrzej Nowacki [Thu, 8 Mar 2012 14:56:33 +0000 (15:56 +0100)]
Crash fix in QMetaType::typeFlags.

The function is public, so it should validate input instead of crashing

Change-Id: Id67463b0b61ab74a76c1ede7f052bdbed37822b6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoMake tst_qsql.cpp independent of QtWidgets
Debao Zhang [Sat, 10 Mar 2012 03:04:43 +0000 (19:04 -0800)]
Make tst_qsql.cpp independent of QtWidgets

Change-Id: I032902bea6fe2c7d9eb0491886fded7602ae2bcc
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoXCB: Implement native events for for windows.
Friedemann Kleint [Fri, 9 Mar 2012 13:35:11 +0000 (14:35 +0100)]
XCB: Implement native events for for windows.

Change-Id: Iacea1231b49ebe57da96f4012d3f314e1b037105
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove unneeded check.
Sergio Martins [Sat, 10 Mar 2012 18:28:40 +0000 (18:28 +0000)]
Remove unneeded check.

It would have already crashed on
QOpenGLSharedResource(ctx->shareGroup()).

Change-Id: Ib68759457a0fa7e4417dcd30cc40fbabf3df232c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoqdoc3: qdoc user manual update
Martin Smith [Thu, 8 Mar 2012 10:57:34 +0000 (11:57 +0100)]
qdoc3: qdoc user manual update

Changed \bold to \b, \i to \e, and \o to \li.

Task-number:  QTBUG-24578

Change-Id: If02517164f30f05436596224c1b1895a86d9e9f8
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agobyteorder: Fix compilation for MIPS and GCC < 4.6.
Holger Hans Peter Freyther [Thu, 8 Mar 2012 09:28:56 +0000 (10:28 +0100)]
byteorder: Fix compilation for MIPS and GCC < 4.6.

Use the pre-processor macros to detect the byte order. This is
how it is done for ARM and other platforms. Use the variant of
the macro with the most underscores to match our ARM detection.

Change-Id: I7d2b34bf45a7f3979b44a1fe2e95f678152a5dcd
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove commented 'comment'
ABBAPOH [Sun, 26 Feb 2012 11:19:00 +0000 (15:19 +0400)]
Remove commented 'comment'

Change-Id: I996a34fb2dc91da8b68039b4bc797a255c99d2e0
Reviewed-by: David Faure <faure@kde.org>
12 years agoFix commas according to qt coding style
ABBAPOH [Sun, 26 Feb 2012 11:17:59 +0000 (15:17 +0400)]
Fix commas according to qt coding style

Change-Id: Ibf49f1c3d426917d1cfcb382c8ed2771d43d6e99
Reviewed-by: David Faure <faure@kde.org>
12 years agofix the check for libraries having themselves as dependencies
Oswald Buddenhagen [Fri, 24 Feb 2012 19:00:08 +0000 (20:00 +0100)]
fix the check for libraries having themselves as dependencies

Change-Id: I6dc56228a068fe9158e989afd1c545a3d69848e6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoRevert "QNam: only init channels when needed."
Kent Hansen [Fri, 9 Mar 2012 20:27:45 +0000 (21:27 +0100)]
Revert "QNam: only init channels when needed."

This reverts commit ff25691d00d634068c6389f8f1607d7cc95ac5be.

The change broke qtdeclarative. Several autotests crash because
QHttpNetworkConnection::transparentProxy() calls proxy() on a
null socket.

Task-number: QTBUG-24717
Change-Id: I57e3ccf5d20683f59cf7450083d1fcb3fa1c40fe
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoanother attempt at solving the popping up of .qmake.cache problem
Oswald Buddenhagen [Fri, 9 Mar 2012 18:11:54 +0000 (19:11 +0100)]
another attempt at solving the popping up of .qmake.cache problem

syncqt may generate that file also as a result of configure tests. so
just check for the file's existence instead of trying to reproduce under
which circumstances it should appear.

Change-Id: Ia24f96b05fc70e104f7be19d08cea614ffb505be
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoRemove erroneous never referenced QT_NO_GUI define
Donald Carr [Fri, 9 Mar 2012 10:26:36 +0000 (10:26 +0000)]
Remove erroneous never referenced QT_NO_GUI define

Logic was clearly always off kilter, and this was only defined for GUI
builds

Change-Id: Ie85c156510e7c450a5192408b4c365ff07ce2029
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoUpdated codecs.pri to reflect new QNX mkspec name
Rafael Roquetto [Fri, 9 Mar 2012 10:49:28 +0000 (11:49 +0100)]
Updated codecs.pri to reflect new QNX mkspec name

Change-Id: Icd4a9dd774991c2be180b885b3892ff85a3f8dc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agobyteorder: Improve the implementation comments for auto-detect
Holger Hans Peter Freyther [Thu, 8 Mar 2012 09:25:13 +0000 (10:25 +0100)]
byteorder: Improve the implementation comments for auto-detect

Parts of the auto-detection is using __BYTE_ORDER__. This
pre-processor macro was added in GCC 4.6. Document that in
the auto-detection code. Remove the misleading error message
in qsysinfo.h.

Change-Id: I66430ba1c9a1cdf476889ae6d5f3ca476243e000
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFixes wrong iconv_open call under QNX
Rafael Roquetto [Fri, 9 Mar 2012 10:59:29 +0000 (11:59 +0100)]
Fixes wrong iconv_open call under QNX

The wrong macro logic was causing iconv_open to never be
called under QNX.

Change-Id: I3367872fc8440f87fb59667770acd06262aef723
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoremove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2)
Mark Brand [Fri, 9 Mar 2012 16:15:26 +0000 (17:15 +0100)]
remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2)

Follow-up to d13bedb9d8fb66f58ba901864555bcc9b6e463e0
where the regexp was a bit too tight and missed many specs.

Also cleaned up QMAKE_IDC, QMAKE_RCC and QMAKE_IDL.

Change-Id: Ia15007141739019ef5ccfdda0c856c478f732b85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoqws: Remove decorations/kbd/mouse plugin support from configure
Holger Hans Peter Freyther [Fri, 9 Mar 2012 09:17:16 +0000 (10:17 +0100)]
qws: Remove decorations/kbd/mouse plugin support from configure

Change-Id: Iaca207ed892b2f5f5d1650ed27007532a172544c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix some duplication between QGuiApplication and QApplication,
David Faure [Wed, 7 Mar 2012 21:52:42 +0000 (22:52 +0100)]
Fix some duplication between QGuiApplication and QApplication,

for the mouseButtons and keyboardModifiers vars and methods.
Implement queryKeyboardModifiers with a new virtual in
QPlatformIntegration.

Task-number: QTBUG-11243
Change-Id: I9e95841542ac61c73ff72d7682ad962ea8aada42
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFixes mismatching delete operator
Rafael Roquetto [Fri, 9 Mar 2012 11:19:15 +0000 (12:19 +0100)]
Fixes mismatching delete operator

Change-Id: Ib6640daa0fdd12f98f9d7e257c226e0abdcf31dc
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoMake tst_qapplication build when QT_NO_SHAREDMEMORY is defined
Kevin Krammer [Fri, 9 Mar 2012 11:56:41 +0000 (12:56 +0100)]
Make tst_qapplication build when QT_NO_SHAREDMEMORY is defined

Change-Id: I8cfd0ff2e17e6d5c04b81a042c665bcbbca36256
Reviewed-by: David Faure <faure@kde.org>
12 years agoUse qt_safe_read to read from low-level file descriptor
Kevin Krammer [Fri, 9 Mar 2012 11:59:48 +0000 (12:59 +0100)]
Use qt_safe_read to read from low-level file descriptor

Change-Id: I7c7bc379a423be4de471c5972cb98101c90bab8c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoWindows: Fix QStyleSheetStyle autotest antialiasing issues
Miikka Heikkinen [Fri, 9 Mar 2012 09:06:18 +0000 (11:06 +0200)]
Windows: Fix QStyleSheetStyle autotest antialiasing issues

Antialiasing of fonts was causing two tests that relied on finding
at least a certain number of pixels of certain color to find one or two
too few pixels of that color and thus fail.
Fixed by increasing the amount of text displayed to make sure enough
pixels of correct color would be present.

Also removing the test insignification, as the test will now
pass completely when run under Windows Classic theme, which CI uses.

Task-number: QTBUG-24323
Change-Id: Ic0b614d33e4e4f5df18d53cb72a05db5d8b6b5e7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agodo not copy/symlink qmake to build dir
Oswald Buddenhagen [Fri, 9 Mar 2012 09:50:23 +0000 (10:50 +0100)]
do not copy/symlink qmake to build dir

make is perfectly capable of doing shadow builds

Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoMake tst_qmouseevent.cpp independent of QtWidgets
Debao Zhang [Fri, 9 Mar 2012 02:45:13 +0000 (18:45 -0800)]
Make tst_qmouseevent.cpp independent of QtWidgets

Change-Id: I6759c7be44c2d890c1a745effdd70faa3467fe5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoClean up for some auto tests of the gui/kernel.
Debao Zhang [Fri, 9 Mar 2012 02:37:30 +0000 (18:37 -0800)]
Clean up for some auto tests of the gui/kernel.

They are not dependent on QtWidgets.

Change-Id: Icbc0b0b6f0b72537fd3058cc038a1f5c4bf2aba7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agotst_qimagereader: does not depend on QtWidgets
Debao Zhang [Thu, 8 Mar 2012 23:48:51 +0000 (15:48 -0800)]
tst_qimagereader: does not depend on QtWidgets

Both tst_qimagereader.cpp and tst_qimagewriter.cpp do not depend on
QtWidgets.

Change-Id: I7e8b31c23db203c44ccb4cd4e8e747d18c5d7ed7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoStart eventTime timer so that the .elapsed method will work.
Jon Trulson [Wed, 29 Feb 2012 23:06:56 +0000 (16:06 -0700)]
Start eventTime timer so that the .elapsed method will work.

QWindowSystemInterfacePrivate::eventTime.start() is never called,
resulting in all calls to
QWindowSystemInterfacePrivate::eventTime.elapsed() within
qwindowsysteminterface_qpa.cpp to return 0.  This could cause events
to be lost, such as mouse button press events from the evdevmouse
input plugin.

Change-Id: Iba9d23b51af80e8532d24ccf382e9077c06bb4be
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agomisc: Fix some random typos and grammar while reading code.
Holger Hans Peter Freyther [Wed, 7 Mar 2012 08:57:39 +0000 (09:57 +0100)]
misc: Fix some random typos and grammar while reading code.

Typos:
recieve   -> receive
descrived -> describe

Grammar:
this types -> these types

Change-Id: Iedacc51a6322996f423ac9472af0a597424a4fed
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFix copy/paste error in QAbstractItemModel::insertRow docu.
David Faure [Thu, 8 Mar 2012 15:04:16 +0000 (16:04 +0100)]
Fix copy/paste error in QAbstractItemModel::insertRow docu.

This method is not virtual.

Change-Id: I1c82a63af07d7e78e7a572c0dfcfb2b82122d421
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRemove widgets dependency from eglfs
Donald Carr [Tue, 6 Mar 2012 22:35:30 +0000 (22:35 +0000)]
Remove widgets dependency from eglfs

eglfs uses the (old) OpenGL paint engine for paint operations. This drags in a
QWidget dependency and hence everything bar the kitchen sink. This change
gets eglfs buildable without widget support although anything which relies
on a QPaintDevice will end up rendering nothing to the screen. (Similar
to the QWS simplegl driver)

Change-Id: If7fcdb79038ef7568e771402fd1667bc0318ff5f
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoRemove calls for default constructors
ABBAPOH [Sun, 26 Feb 2012 11:17:14 +0000 (15:17 +0400)]
Remove calls for default constructors

Change-Id: Ib33013bed9e6b7bb9ef54c858da5cd61f35f2c41
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoUse SSL_MODE_RELEASE_BUFFERS in QSslSocket
Martin Petersson [Wed, 7 Mar 2012 15:17:11 +0000 (16:17 +0100)]
Use SSL_MODE_RELEASE_BUFFERS in QSslSocket

If SSL_MODE_RELEASE_BUFFERS is available we should tell OpenSSL
to release memory early.
http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html

Task-number: QTBUG-14985
Change-Id: Ib6656ebb3c4d67ca868b317ee83ddbf0983953f9
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Markus Goetz <markus@woboq.com>
12 years agoFix a performance regression with shouldLoadFontEngineForCharacter.
Pierre Rossi [Wed, 7 Mar 2012 13:53:57 +0000 (14:53 +0100)]
Fix a performance regression with shouldLoadFontEngineForCharacter.

Calling FcFontMatch should be avoided as much as possible. We can simply
cache the patterns it returns, which should still save memory compared to
loading all font engines as we did before.

Change-Id: I67208a4f919338a948535f717cfd0139dbea2e5f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix platforms.pro to match new qnx mkspec name
Rafael Roquetto [Thu, 8 Mar 2012 10:58:32 +0000 (11:58 +0100)]
Fix platforms.pro to match new qnx mkspec name

Change-Id: Ib159b519d11c9b88979f0f47b87801552586abc0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoBuild fix when use '-no-stl' option
Yuchen Deng [Thu, 1 Mar 2012 12:24:56 +0000 (20:24 +0800)]
Build fix when use '-no-stl' option

error C2039: 'move' : is not a member of 'std'
error C3861: 'move': identifier not found

Change-Id: I40beb59f893a8969275154664c947889eb570c95
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd debug stream operator for QNetworkProxy
Shane Kearns [Tue, 28 Feb 2012 11:57:12 +0000 (11:57 +0000)]
Add debug stream operator for QNetworkProxy

Change-Id: Ib8e7ba041ede33dc9c751432e39be2d6a9f4662d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd cross_compile to qconfig.pri for global advertising
Donald Carr [Wed, 29 Feb 2012 23:55:13 +0000 (23:55 +0000)]
Add cross_compile to qconfig.pri for global advertising

.qmake.cache is not necessarily accessible to other modules which depend on
information about whether we are cross compiling or not. We might as well
advertise this fact globally via the CONFIG variable in qconfig.pri.

Change-Id: I6dee3e6604e5ca1c775c5f9f834fe29b4e27adb8
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
12 years agodon't put QMAKE_ABSOLUTE_SOURCE_ROOT into .qmake.cache
Oswald Buddenhagen [Fri, 2 Mar 2012 19:12:03 +0000 (20:12 +0100)]
don't put QMAKE_ABSOLUTE_SOURCE_ROOT into .qmake.cache

this is oxymoronic: if a .qmake.cache is present, telling qmake the
project root is utterly pointless.
the windows variant never had this.

Change-Id: Iefc6e242ad7458dc699b955a3657f31f1ecf4c7b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove support for QMAKE_PLATFORM_DIR
Oswald Buddenhagen [Thu, 1 Mar 2012 20:44:54 +0000 (21:44 +0100)]
remove support for QMAKE_PLATFORM_DIR

this was a somewhat magic support for sysroots, automatically rewriting
a number of path-holding variables. this was (as usual) completely
undocumented, extremely fragile, and we are coming up with something
better now anyway.

Change-Id: I045910f532cb3efc839ea81c7a48f8db695e4092
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove the fixed qt tool assignments from the configures
Oswald Buddenhagen [Thu, 1 Mar 2012 16:45:55 +0000 (17:45 +0100)]
remove the fixed qt tool assignments from the configures

the tool locations are now determined with qtPrepareTool(), which takes
non-installed qt builds into account already.

Change-Id: I17b2c5f4b181417f2a612be2f540768e7dc0ae4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoBlackBerry Plugin: support 8 mouse buttons, instead of just 3.
Rick Stockton [Thu, 8 Mar 2012 00:38:37 +0000 (16:38 -0800)]
BlackBerry Plugin: support 8 mouse buttons, instead of just 3.

The mask of possible mouse buttons in QNX provides tracking for the
up/down State of up to 8 mouse buttons. This update adds support
for the 5 buttons which we previously ignored in Qt on this Platform.

Task-number: QTBUG-24682

Change-Id: I8c1d2b2a5d0deb3b857fb387c242c3792e21ff95
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoFix qtmodule-configtests to honor error codes
Girish Ramakrishnan [Thu, 8 Mar 2012 13:11:11 +0000 (05:11 -0800)]
Fix qtmodule-configtests to honor error codes

The test is marked as fail if qmake or make fails.

Change-Id: I565c68af4a9271d7aa36fb592ac399aa728ba4d8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
12 years agoQRegularExpression: minor fix to captureIndexForName
Giuseppe D'Angelo [Sun, 26 Feb 2012 22:37:45 +0000 (22:37 +0000)]
QRegularExpression: minor fix to captureIndexForName

Although passing a null pointer to pcre16_get_stringnumber for
the compiled pattern should simply make it error out, it's actually
an undocumented behaviour, so let's stay safe and add an explicit
check.

Tests for this codepath are added.

Change-Id: Ifd9c87874f6812ba487104ec1a5bbc83c3b16761
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQRegularExpression: improve JIT memory handling
Giuseppe D'Angelo [Thu, 23 Feb 2012 02:53:08 +0000 (02:53 +0000)]
QRegularExpression: improve JIT memory handling

PCRE's JIT uses by default 32K on the pcre_exec caller's stack. This
is fine for most situations, but in some cases (esp. patterns with
lot of recursion) more memory is required.

Therefore, if a match execution fails due to exhausting JIT memory,
we let PCRE allocate up to 512KB to be used for the JIT's stack.

The pointer to the allocated memory is put in thread local storage
(so it can be reused from the same thread, if needed, and automatically
goes away when the thread dies).

Change-Id: Ica5fb7d517068befff88ebb198a603a26ec5d8a7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoWindows: Fix flag handling.
Friedemann Kleint [Thu, 8 Mar 2012 15:13:28 +0000 (16:13 +0100)]
Windows: Fix flag handling.

Fix a typo that caused a variable to be hidden such that
the Qt::WindowFlags were not used.

Change-Id: Iea4456b0cd4c968e0fbfdd53e5006ffee0298b24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQtNetwork: blacklist two more certificates
Martin Petersson [Wed, 7 Mar 2012 11:05:59 +0000 (12:05 +0100)]
QtNetwork: blacklist two more certificates

The comodogate 72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0
certificate is a test certificate and the MD5 Collisions was created
as a proof of concept deliberately made to be expired at the time
of it's creation.

Task-number: QTBUG-24654
Change-Id: Ic8eb417363569fe50bf19cd229658f5e371862f7
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoreplace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific variables
Oswald Buddenhagen [Mon, 5 Mar 2012 10:49:51 +0000 (11:49 +0100)]
replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific variables

Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREE
Oswald Buddenhagen [Fri, 2 Mar 2012 20:32:02 +0000 (21:32 +0100)]
remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREE

Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove automatic building of moc from moc.prf
Oswald Buddenhagen [Fri, 2 Mar 2012 16:52:12 +0000 (17:52 +0100)]
remove automatic building of moc from moc.prf

the problem this (probably) tried to solve has been solved via ordered
builds a *long* time ago.

Change-Id: I84c58076c864735eea4210ec60aa060fe3e5d97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>