profile/ivi/qtbase.git
13 years agoCorrect antialias disabling logic for Core Text
Jiang Jiang [Fri, 3 Jun 2011 14:03:00 +0000 (16:03 +0200)]
Correct antialias disabling logic for Core Text

We should always turn antialias off when QFont::NoAntialias being
passed in styleStrategy. That corrects some QStaticText tests.

Change-Id: Iaffc5f3bb7f501dcb648cab41a8b6ffcf93f90ae
Reviewed-on: http://codereview.qt.nokia.com/328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoCorrect QStaticText tests after recent changes
Jiang Jiang [Fri, 3 Jun 2011 14:08:54 +0000 (16:08 +0200)]
Correct QStaticText tests after recent changes

Raster engine on Mac now correctly handles transformation, so no
need to XFAIL anymore. Also fixes a drawStaticText origin mistake,
the y origin should be the top left point rather than the baseline.

Change-Id: I6058e7099b336d9d5a6586344a07be3c7d76fb64
Reviewed-on: http://codereview.qt.nokia.com/329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoImplemented module-local caching of module profiles.
axis [Wed, 18 May 2011 13:23:51 +0000 (15:23 +0200)]
Implemented module-local caching of module profiles.

We use syncqt to generate .qmake.cache also for submodules, which
contains the location of forwarding module profiles for that module.
This enables us to build without having to put module profiles into
mkspecs/modules until install time.

Also added support for -developer-build to syncqt.

What it does is to point build directories for binaries and
libraries to a common location in QtBase. This is more
convenient when doing development, since you don't need to set your
path to every module's bin/ directory, but it cannot be used with
release builds, since they need to build independently of QtBase,
in their own directory.

Change-Id: I959c62c11c644f2147a98da894a72452d9c44327
Task: QTBUG-19585
Task: QTBUG-19583
Reviewed-on: http://codereview.qt.nokia.com/232
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoInstall some headers that were previously missing from install.
axis [Wed, 18 May 2011 13:28:25 +0000 (15:28 +0200)]
Install some headers that were previously missing from install.

Change-Id: I58a5f58e6e03e3e266de23beee47de0c823f3240
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/233
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoDon't base QTDIR detection on .qmake.cache.
axis [Fri, 13 May 2011 14:49:51 +0000 (16:49 +0200)]
Don't base QTDIR detection on .qmake.cache.

Change-Id: I4adc26c1c070d26277551d302f4638b819ddc311
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoMake sure that we error out if we cannot write forwarding profile.
axis [Fri, 13 May 2011 14:22:09 +0000 (16:22 +0200)]
Make sure that we error out if we cannot write forwarding profile.

Change-Id: Ic0b62532dd8a52cf6ab7a7c10c5ffbe3c9039ec1
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/229
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoChanges needed for Qt to accept module .qmake.cache files.
axis [Fri, 13 May 2011 14:48:06 +0000 (16:48 +0200)]
Changes needed for Qt to accept module .qmake.cache files.

Also introduced the QMAKE_EXTRA_MODULE_FORWARDS for specifying a
folder where forwarding profiles will be put.

Change-Id: I8cb242838a5a4d42dc5e3cfd0bd858ab0d2696cd
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/230
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoAdd basic static text drawing capability to lance
Jiang Jiang [Fri, 3 Jun 2011 11:31:05 +0000 (13:31 +0200)]
Add basic static text drawing capability to lance

Task-number: QTBUG-17514
Change-Id: Ife7cd8f940424d805f634ca190bcbf6fd83d8682
Reviewed-on: http://codereview.qt.nokia.com/321
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: aavit <qt_aavit@ovi.com>
13 years agoFix Windows build
Jiang Jiang [Fri, 3 Jun 2011 09:54:58 +0000 (11:54 +0200)]
Fix Windows build

Change-Id: Ieafe2cefe0dcb00a3b22133506fb854428abff5e
Reviewed-on: http://codereview.qt.nokia.com/320
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoRefactor glyph pretransform check
Jiang Jiang [Wed, 1 Jun 2011 09:06:55 +0000 (11:06 +0200)]
Refactor glyph pretransform check

Move paintEngineSupportsTransformations logic from QPainter to paint
engine subclasses. Simplify and consolidate checks for cached drawing
(pretransformed) and path drawing (untransformed) in raster paint
engine. Fix unnecessary transform when paint engines actually take
the path drawing track. Fix scaling and rotation transform in raster
engine for Mac.

Task-number: QTBUG-19086
Change-Id: I1c0c1800a5173d3db765b9fccfd0e7a3628e3815
Reviewed-on: http://codereview.qt.nokia.com/298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoFixed an argument parsing bug in syncqt.
axis [Fri, 13 May 2011 14:07:56 +0000 (16:07 +0200)]
Fixed an argument parsing bug in syncqt.

We need to move the detection up above the general -no-* match,
otherwise it never hits.

Change-Id: I04ab5a1ed2c4a01219e7b9e10948b3fc4989f4b8
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoAllow SHM buffers to be displayed in Wayland plugin when using DRM
Andy Nichols [Wed, 1 Jun 2011 13:34:50 +0000 (15:34 +0200)]
Allow SHM buffers to be displayed in Wayland plugin when using DRM

When running an application with the wayland backend, SHM window
surfaces were not being displayed on the wayland-demo compositor as
wl_surface_damage was being called, but not wl_buffer_damage as well.

Change-Id: I2ffea3bbb20cb3729cd029bd21855819cd7fcf55
Reviewed-on: http://codereview.qt.nokia.com/305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
13 years agotst_qnetworkreply: add a test for http abort.
Martin Petersson [Wed, 1 Jun 2011 10:38:34 +0000 (12:38 +0200)]
tst_qnetworkreply: add a test for http abort.

Change-Id: Iec5fe195ff2befe92e759f77768240728bef31bd
Reviewed-on: http://codereview.qt.nokia.com/302
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Markus Goetz
13 years agosockets: limit buffer size of the internal sockets in proxy engines
Shane Kearns [Tue, 24 May 2011 13:05:48 +0000 (14:05 +0100)]
sockets: limit buffer size of the internal sockets in proxy engines

The application can normally control the amount of buffering of a
socket or QNetworkReply by using the setReadBufferSize API.
This allows the application to flow control the TCP connection, and
avoids out of memory errors when the data being downloaded is received
faster than the application can process it.

However when using a proxy, the proxy socket engine has an internal
socket which is used to communicate with the proxy server. It is not
visible to the user, and does not have awareness of the buffer size of
the external socket.

To solve this, we limit the internal sockets' buffer size to 64k bytes.
Under normal operation, the data is swiftly copied to the external
socket where the buffer can grow (or not) based on the application's
set value for read buffer size.

Task-number: QT-4966
Reviewed-by: Markus Goetz
(cherry picked from commit c4727a85eed57a4db698326a1bed4aa75b6e5284)

Change-Id: I29e6628e38b79b41c4464ba8cb772a0f03717043
Reviewed-on: http://codereview.qt.nokia.com/153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Markus Goetz
13 years agoMake TextEdit word selection more natural.
Andrew den Exter [Fri, 13 May 2011 03:49:20 +0000 (13:49 +1000)]
Make TextEdit word selection more natural.

QTextControl will only extend the selection to a word if the cursor is
directly over it which prevents the selection being extended if the
mouse is dragged up or down a to a shorter line of text making it
difficult to select multiple lines of text.  Just disable that
limitation when the TextEdit word selection is enabled.

Change-Id: I3b9d1575c0141db8441197d740de94a90eacc077
Task-number: QTBUG-19230
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/292
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoEnsure the TextEdit cursor delegate is repositioned on mouse events.
Andrew den Exter [Mon, 9 May 2011 03:57:34 +0000 (13:57 +1000)]
Ensure the TextEdit cursor delegate is repositioned on mouse events.

Update the micro focus when a mouse press changes the cursor position
of a read only TextEdit.

Change-Id: I11855037f7938b2cd23ac6ad165722b5289b4f46
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/291
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoDon't crash on an invalid replacementStart from an input method.
Andrew den Exter [Mon, 9 May 2011 04:04:08 +0000 (14:04 +1000)]
Don't crash on an invalid replacementStart from an input method.

Ensure the cursor position does not exceed the bounds of the
current text.

Change-Id: If38f7729372562324d11eadd1a976c0c6da91863
Task-number: QTBUG-19054
Reviewed-by: Martin Jones
(cherry picked from commit 6fbfb1ab3f26ad672eb24f9b4a0ce1a8eea08298)
Reviewed-on: http://codereview.qt.nokia.com/290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoFix build in C++0x mode
Bernhard Rosenkraenzer [Mon, 30 May 2011 09:31:42 +0000 (11:30 +0159)]
Fix build in C++0x mode

This fixes compiler errors (gcc 4.6 -std=gnu++0x on x86_64 Linux):

embedded/qwslock.cpp: In function `bool forceLock(int, int, int)':
embedded/qwslock.cpp:121:39: error: narrowing conversion of `semNum'
        from `int' to `short unsigned int' inside { } [-fpermissive]

(and equivalent errors in other lines/files)

See
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf
Section 8.5.4/6

Change-Id: I2cbac5482b87f33287a416af5a5c9bde621720bc
Reviewed-By: Olivier Goffart
Merge-Request: 1240
Reviewed-on: http://codereview.qt.nokia.com/275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoMade qpluginbase.pri into a feature profile.
axis [Fri, 27 May 2011 08:10:36 +0000 (10:10 +0200)]
Made qpluginbase.pri into a feature profile.

This enables other modules to use it without having access to the
QtBase sources.

Change-Id: I0a588b2e14ca88fa068c7c2bcc69ff669444f6c6
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMoved certain qmake config variables to .qmake.cache.
axis [Fri, 27 May 2011 13:36:22 +0000 (15:36 +0200)]
Moved certain qmake config variables to .qmake.cache.

The reason is that these are local to the build, and should not be
present inside the qmodule.pri file, because this file is installed.

Change-Id: I2207f2bf068b1aafd14e60d106c7028ca53d5efd
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/238
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFixed linking against QtQuickTest on mac.
Charles Yin [Fri, 27 May 2011 04:43:13 +0000 (14:43 +1000)]
Fixed linking against QtQuickTest on mac.

qmltest is now a Qt module, so it's not necessary to configure
the include&library paths manually.

Change-Id: I1d2baa67138e08ab9007fba9f6adcf8847509ba8
Reviewed-on: http://codereview.qt.nokia.com/163
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoExport the qt_gl_read_framebuffer function for use in declarative
Gunnar Sletta [Mon, 30 May 2011 13:33:21 +0000 (15:33 +0200)]
Export the qt_gl_read_framebuffer function for use in declarative

Change-Id: Ia1dd186ca954774e1faaa4b2e606acac9333d9b0
Reviewed-on: http://codereview.qt.nokia.com/224
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
13 years agoSupport placing cursor in ligature with mouse or touch
Jiang Jiang [Thu, 19 May 2011 08:29:49 +0000 (10:29 +0200)]
Support placing cursor in ligature with mouse or touch

We need to find out the closest element in the ligature to
the point we clicked (or tapped), currently we do this by
dividing the width of that ligature glyph evenly by the number
of characters it covered. We only support Common and Greek script
at this point, ligatures in other scripts are still handled as a
whole.

Task-number: QTBUG-19260
Reviewed-by: Eskil
(cherry picked from commit 5338d78aa9d80ddd2bcb21e6b22cd2cf1522a7d3)

Change-Id: Ic747e9458d561aca0848dcd1e8b94e0a23fd8189
Reviewed-on: http://codereview.qt.nokia.com/196
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoOnly add dependent include when not already there
Marius Storm-Olsen [Fri, 27 May 2011 18:43:30 +0000 (13:43 -0500)]
Only add dependent include when not already there

Change-Id: I517ad8188a6f6b5ade763f0189f434f446ab6f05
Reviewed-on: http://codereview.qt.nokia.com/198
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoFix ligature offset in multi-line text
Jiang Jiang [Fri, 20 May 2011 08:26:54 +0000 (10:26 +0200)]
Fix ligature offset in multi-line text

Reviewed-by: Eskil
(cherry picked from commit 278cf1f37945050c4a46d5acab0659f3a7546a43)

Change-Id: Ice20aa38a49ea16cf56bd3705c7d400ee165a9c2
Reviewed-on: http://codereview.qt.nokia.com/195
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoFix compile for systems with old fontconfig
Jiang Jiang [Fri, 27 May 2011 12:24:21 +0000 (14:24 +0200)]
Fix compile for systems with old fontconfig

Change-Id: Ia26796bdbab7988d14163d3c1290111c0cb22bf7
Reviewed-on: http://codereview.qt.nokia.com/182
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAdd QUuid::toRfc4122() and fromRfc4122()
Liang Qi [Fri, 27 May 2011 11:34:28 +0000 (13:34 +0200)]
Add QUuid::toRfc4122() and fromRfc4122()

Following the RFC4122, provide the interfaces between QUuid
and QByteArray, they are simpler then toByteArray() and
relevant.

Thanks for the suggestion and brief code from Robin Burchell.

Task-number: QTBUG-19420
Reviewed-by: joao
(cherry picked from commit 06873e467d98ad60d827afae29500bf2ff783c03)

Change-Id: I4623ae3363f1d5affa45de73fac616bb67a9eaa1
Reviewed-on: http://codereview.qt.nokia.com/168
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoAdd QUuid::toByteArray() and relevant
Liang Qi [Fri, 20 May 2011 09:36:01 +0000 (11:36 +0200)]
Add QUuid::toByteArray() and relevant

Add QUuid::toByteArray() and QUuid(const QByteArray &). Same
behavior with QUuid::toString() and QUuid(const QString &).

Task-number: QTBUG-19419
Reviewed-by: joao
(cherry picked from commit 71f923f29e2c60444a85fc765fc582e06cb7eca4)

Change-Id: I41dad65e269f739ba9ec1c27e9da96af6401356c
Reviewed-on: http://codereview.qt.nokia.com/167
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoQDataStream: speedup steaming of QUuid.
Liang Qi [Fri, 20 May 2011 07:48:30 +0000 (09:48 +0200)]
QDataStream: speedup steaming of QUuid.

By reading and writing as a whole block, because the size of QUuid
is fixed.

Reviewed-by: joao
(cherry picked from commit d56d7f107f9d18810d742ac4d3a2e36077722cb8)

Change-Id: I90554d68da7394c99c48acd0bc5a0eee3b3f7776
Reviewed-on: http://codereview.qt.nokia.com/169
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoOptimize QUuid::QUuid(const char *)
Liang Qi [Fri, 20 May 2011 10:45:56 +0000 (12:45 +0200)]
Optimize QUuid::QUuid(const char *)

Reviewed-by: joao
(cherry picked from commit 96d10abbb40c52ac6274f1144766f3fb27dfd726)

Change-Id: I050b602b6cac669b4d88046b0a707048ce0a8cda
Reviewed-on: http://codereview.qt.nokia.com/170
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoFix the build for QUuid
Liang Qi [Mon, 23 May 2011 07:27:23 +0000 (09:27 +0200)]
Fix the build for QUuid

Add a quint8 specialization for qbswap.

Reviewed-by: Bradley T. Hughes
(cherry picked from commit 32a583b575da1b387955734ccf36b0a93de37670)

Change-Id: I7dae5e47565ed30de960983649e5c214e0303fe3
Reviewed-on: http://codereview.qt.nokia.com/171
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agouic: #include <QLayout> for QToolBox on non-laid-out forms.
Friedemann Kleint [Mon, 23 May 2011 07:03:52 +0000 (09:03 +0200)]
uic: #include <QLayout> for QToolBox on non-laid-out forms.

for the fake tab-spacing property, which accesses the internal
layout and sets its spacing.

Task-number: QTBUG-19339
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Change-Id: I89f5c035bd3798a0998c3046de643bda0fa8da6b
(cherry picked from commit 89f5c035bd3798a0998c3046de643bda0fa8da6b)
Reviewed-on: http://codereview.qt.nokia.com/173
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agouic: Use QString::fromUtf8 for QUrl properties.
Friedemann Kleint [Wed, 25 May 2011 09:27:40 +0000 (11:27 +0200)]
uic: Use QString::fromUtf8 for QUrl properties.

As otherwise the compilation of ui_-files fails when
using QT_NO_CAST_FROM_ASCII. Bug reported on mailing list.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Change-Id: I00bf2e2605b97ff77efdcb68b7968375b3e9d195
(cherry picked from commit 00bf2e2605b97ff77efdcb68b7968375b3e9d195)
Reviewed-on: http://codereview.qt.nokia.com/174
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix a regression in QList::mid()
Liang Qi [Mon, 16 May 2011 08:48:05 +0000 (10:48 +0200)]
Fix a regression in QList::mid()

It doesn't need to copy anything when pos is after size().

Task-number: QTBUG-19164
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit 8befc4982a32752e48c82cacbed045e7336a3569)

Change-Id: Iccac75842616f0d41e457e844a15d1a3ccfeb642
Reviewed-on: http://codereview.qt.nokia.com/164
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoAdd some autotests and benchmarks for QUuid
Liang Qi [Fri, 20 May 2011 12:12:57 +0000 (14:12 +0200)]
Add some autotests and benchmarks for QUuid

Missing those functions for optimization.

Reviewed-by: joao
(cherry picked from commit 4e9286880fd2686e61de2c4be3c317e01f0d9989)

Change-Id: I147e028f10cec7abc545dcbcca911d39a89d830e
Reviewed-on: http://codereview.qt.nokia.com/165
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoOptimize QUuid::toString() and relevant
Liang Qi [Fri, 20 May 2011 09:07:06 +0000 (11:07 +0200)]
Optimize QUuid::toString() and relevant

QUuid::toString() and QUuid(const QString &) are too slow now.

Task-number: QTBUG-19418
Reviewed-by: joao
Reviewed-by: Denis Dzyubenko
Reviewed-by: Ritt Konstantin
Reviewed-by: Robin Burchell
Reviewed-by: Richard J. Moore
(cherry picked from commit 7ce566ed82666ac08f137f4d8590ce589d42c82a)

Change-Id: I7e5bb4072f0941c20a7278a2d9766d4ef47be811
Reviewed-on: http://codereview.qt.nokia.com/166
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agotests: fixed compile of tst_macgui
Rohan McGovern [Fri, 27 May 2011 03:53:09 +0000 (13:53 +1000)]
tests: fixed compile of tst_macgui

This test uses private headers.  Mark it as such.

Change-Id: Icb6463629e1414b9da5403d0e0d766d8a113bd57
Reviewed-on: http://codereview.qt.nokia.com/160
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agotests: fixed compilation of qstring benchmark on mac
Rohan McGovern [Fri, 27 May 2011 04:31:11 +0000 (14:31 +1000)]
tests: fixed compilation of qstring benchmark on mac

On Mac, MAP_ANONYMOUS and MAP_POPULATE are not defined.

Fix MAP_ANONYMOUS by defining it to MAP_ANON.

Fix MAP_POPULATE by removing it, because its usage was unnecessary in
this code (the page was explicitly faulted in a few lines later anyway).

Change-Id: Iead82e1a949b35fe3c304d38babac8d4dc6f0769
Reviewed-on: http://codereview.qt.nokia.com/162
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoMake lexgen tests compile
Jason McDonald [Fri, 27 May 2011 03:00:08 +0000 (13:00 +1000)]
Make lexgen tests compile

Correctly declare that the tests depend on the Qt build having testlib.

Change-Id: Icf3332bc81a10e701316f1cd7021d2f6d3c2f424
Reviewed-on: http://codereview.qt.nokia.com/158
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoUse "QT += testlib" consistently
Jason McDonald [Fri, 27 May 2011 03:20:52 +0000 (13:20 +1000)]
Use "QT += testlib" consistently

If a project uses "load(qttest_p4)" it doesn't need to add testlib to
the CONFIG or QT variables.  If a project does not use
"load(qttest_p4)", it should add "testlib" to the QT variable.

Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd
Reviewed-on: http://codereview.qt.nokia.com/159
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix infinite recursion when changing geometry on Mac
Gabriel de Dietrich [Thu, 26 May 2011 13:12:48 +0000 (15:12 +0200)]
Fix infinite recursion when changing geometry on Mac

Some complex widgets might get a negatively sized rectangle when
calling QWidgetPrivate:setGeometry_sys_helper(), triggering a infinite
recursion. Normalizing the rectangle size before checking for size
change is enough to break this infinite recursion.

Task-number: QTBUG-17333
Change-Id: I4682c3088ea53fb9f28f746c8264f573b5284825
Reviewed-on: http://codereview.qt.nokia.com/156
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoFix typo in comment
Olivier Goffart [Fri, 20 May 2011 07:31:16 +0000 (09:31 +0200)]
Fix typo in comment

(cherry picked from commit c8a3c427e96ee11907592f5c7f72046795c027ed)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/145
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: axis
13 years agoAdded some of my Qt 4.8 changes to the changelog
Olivier Goffart [Wed, 25 May 2011 13:05:35 +0000 (15:05 +0200)]
Added some of my Qt 4.8 changes to the changelog

Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a
Reviewed-on: http://codereview.qt.nokia.com/140
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoMSVC do not really support initilizer_list
Olivier Goffart [Wed, 20 Apr 2011 11:49:19 +0000 (13:49 +0200)]
MSVC do not really support initilizer_list

std::initializer_list exists, but it is not possible to do bracket
initialisation

Reviewed-by: Joao
(cherry picked from commit a09f5c425079405e72078813bdb7b103c29a5221)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/143
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoSupport of lambdas in QtConcurrent::run
Olivier Goffart [Mon, 18 Apr 2011 12:07:32 +0000 (14:07 +0200)]
Support of lambdas in QtConcurrent::run

Reviewed-by: Joao
(cherry picked from commit 917f2ff617209bcc283eb3590b422bcf239c0537)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/142
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoAdd QtPrivate::QEnableIf
Olivier Goffart [Thu, 19 May 2011 12:43:53 +0000 (14:43 +0200)]
Add QtPrivate::QEnableIf

Needed for QtConcurrent.

Like the new std::enable_if (in c++0x)

Reviewed-by: Joao
(cherry picked from commit 837f18f043b18410c1d93b9f1156acf729dad510)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/141
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoTests for QtConcurrent::map using lambdas
Olivier Goffart [Wed, 18 May 2011 15:55:43 +0000 (17:55 +0200)]
Tests for QtConcurrent::map using lambdas

Also disable tests with std::vector in c++0x as they do not compile

Reviewed-by: Joao
(cherry picked from commit 38d1b31006ecc83811bbb13e5a4182eac593a970)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/144
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoFix instability in QNetworkConfigurationManager autotest
Shane Kearns [Fri, 13 May 2011 15:32:58 +0000 (16:32 +0100)]
Fix instability in QNetworkConfigurationManager autotest

QThread::isFinished() can return false after the finished() signal is
emitted, so test the event loop's timeout() function instead.
Don't compare prescan configurations, as these may be cached by the OS.
It was causing the test to fail on linux if run before any other network
test.

Reviewed-by: mread
(cherry picked from commit e2320ec17446dc6e851fcf4ea2d998177b0d8049)

Change-Id: I35d67294871a35e2e63619f4acb0c3c32caa5eea
Reviewed-on: http://codereview.qt.nokia.com/137
Reviewed-by: Markus Goetz
13 years agoFix thread safety regression of QNetworkConfigurationManager
Shane Kearns [Fri, 13 May 2011 15:19:18 +0000 (16:19 +0100)]
Fix thread safety regression of QNetworkConfigurationManager

Changes in 4.8 led to a timer being created in the wrong thread.
I have restored the invokeMethod used to call startPolling() to solve
this problem.

Reviewed-By: mread
(cherry picked from commit e9e95f75e7c1e8325c2acce0087ff8677d773779)

Change-Id: I8b89fa89766679beb2d469f9bbd1f5e2233f061b
Reviewed-on: http://codereview.qt.nokia.com/138
Reviewed-by: Markus Goetz
13 years agoUpdate qhostinfo autotest to expect RFC5952 formatted ipv6 addresses
Shane Kearns [Wed, 18 May 2011 14:08:53 +0000 (15:08 +0100)]
Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses

Test required updating due to ebc134db484eee31491836b619aad1ee86e3070e

Reviewed-by: Martin Petersson
(cherry picked from commit e46e32644720f0ddeb553b8a658c1711a4b5cdfb)

Change-Id: Idf3df633534a0d914bd22fd589a8c521eb426bc8
Reviewed-on: http://codereview.qt.nokia.com/139
Reviewed-by: Markus Goetz
13 years agofix "Host" header of ipv6 URLs in QNAM
shiroki [Wed, 25 May 2011 09:11:51 +0000 (11:11 +0200)]
fix "Host" header of ipv6 URLs in QNAM

Change-Id: I6bf3320e5ab285e3d1f4d72bd1ef0a0e42813e5b
Reviewed-on: http://codereview.qt.nokia.com/115
Reviewed-by: Markus Goetz
13 years agoAdd QtTools' include/QtDesigner as well as QtCore's include/QtDesigner
Marius Storm-Olsen [Wed, 25 May 2011 17:31:23 +0000 (12:31 -0500)]
Add QtTools' include/QtDesigner as well as QtCore's include/QtDesigner

In modularization QT+=uilib adds the QtCore specific include/QtDesigner,
while QT += designer adds the QtTools specific one.

Using !isEmpty(QT.<module/library>.name) is the proper way to check for
module/library existance in modularized Qt.

Change-Id: If1fe5d192129fd1cdbf43183b52327d7fa9c57ec
Reviewed-on: http://codereview.qt.nokia.com/126
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoAdd private header support to the EGLFS platform plugin.
Jason Barron [Thu, 26 May 2011 09:52:31 +0000 (11:52 +0200)]
Add private header support to the EGLFS platform plugin.

Several of the QPA headers include private headers in the Core, Gui and
OpenGL modules and with the new modularized Qt, we need to opt-in for
these.

Change-Id: Ib7a81f7843ef89e3c5c5218f790287bb6c00e4cb
Reviewed-on: http://codereview.qt.nokia.com/133
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFixed ordering problem when configuring with `-make <part>'
Rohan McGovern [Wed, 25 May 2011 23:19:38 +0000 (09:19 +1000)]
Fixed ordering problem when configuring with `-make <part>'

Prior to this change, running configure with the `-make' option would
affect the order in which parts of Qt are built.  This is unintuitive
and would easily cause build failures.  For example, configuring with
`./configure -make demos' would attempt to build demos before building
libs, which, of course, would fail.

Refactor the code so that the result is the same regardless of the order
of `-make' options.

Change-Id: Idfa61834a0f01d0628a9a1ae27ece94ae3647e6d
Reviewed-on: http://codereview.qt.nokia.com/128
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoRemove the redundant QTEST_ACCESSIBILITY define.
Jason McDonald [Mon, 23 May 2011 07:08:04 +0000 (17:08 +1000)]
Remove the redundant QTEST_ACCESSIBILITY define.

QTEST_ACCESSIBILITY was always defined and only used in one autotest.
Code that uses accessibility features should be excluded if Qt was built
without accessibility rather than based on a define in the test
framework.

Change-Id: I3a517a579a51f536a0983b43bd99e86292026552
Reviewed-by: pending
Reviewed-on: http://codereview.qt.nokia.com/129
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix for compiling and running cube example on Windows.
Kim Motoyoshi Kalland [Wed, 25 May 2011 15:03:59 +0000 (17:03 +0200)]
Fix for compiling and running cube example on Windows.

Change-Id: I0bf933fe81e332c03a81874cb371fa423634621b
Reviewed-on: http://codereview.qt.nokia.com/125
Reviewed-by: David Boddie
13 years agoFix QGLWidget::renderPixmap for raster engine on Mac
Jiang Jiang [Wed, 11 May 2011 14:56:24 +0000 (16:56 +0200)]
Fix QGLWidget::renderPixmap for raster engine on Mac

The QPixmap buffer is backed by QRasterPixmapData instead of
QMacPixmapData for the raster engine, thus we have to update
qt_mac_pixmap_get_base() and qt_mac_pixmap_get_bytes_per_line(),
so that QGLWidget can locate the offscreen buffer from a QPixmap.

Reviewed-by: Fabien Freling
(cherry picked from commit c5846314dfd80e7f7f32ba737f1884dcccbbd80d)

Change-Id: I2414222f8a59e02c778177d52ad9a6e0ff68668d
Reviewed-on: http://codereview.qt.nokia.com/123
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoWorkaround a bug in Core Text to select Light fonts
Jiang Jiang [Mon, 16 May 2011 08:20:54 +0000 (10:20 +0200)]
Workaround a bug in Core Text to select Light fonts

Currently in Core Text there is not proper way to select fonts with
Light weight, for example:
QFont font("Helvetica"); font.setWeight(QFont::Light);
will give you Helvetica-Light, as with:
QFont font("Helvetica"); font.setWeight(QFont::Normal);
because of a bug in Core Text, applying 0 symbolic traits with
CTFontCreateCopyWithSymbolicTraits will always return the Light
variant of that font family. Thus, we should only do this unless
symbolicTraits is not 0 or font.weight is not Normal (Light is not
a symbolic trait, but CT doesn't support selecting Light weight
numerically).

Reviewed-by: Eskil
(cherry picked from commit 4d5b8f66d82e9087d9d58a4e76e6b46ce7bb53cc)

Change-Id: I37a970aba5019a13b9f3bc43b7fb594b74a1aa37
Reviewed-on: http://codereview.qt.nokia.com/124
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoAdd authentication token support for wayland windows
Lasse Holmstedt [Wed, 25 May 2011 09:24:37 +0000 (11:24 +0200)]
Add authentication token support for wayland windows

For compositors that support it, the wayland clients can associate themselves
with an auth token, specified by WL_AUTHENTICATION_TOKEN env var, or by
directly specifying it in the wayland client plugin.

Change-Id: I74a50a27c7c61c2b2cf1e09868618f36edc94cb1
Reviewed-by: Samuel Rødal
Reviewed-on: http://codereview.qt.nokia.com/116
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
13 years agoFix QFontEngineX11FT compilation
Jiang Jiang [Wed, 25 May 2011 09:21:53 +0000 (11:21 +0200)]
Fix QFontEngineX11FT compilation

xglyph_format is only available when XRender is present.

Reviewed-by: Fabien Freling
(cherry picked from commit a6642e4659b3d45ffa94f9a3c6413124d49f2b91)

Change-Id: Ibd767c5055c8fb4a7d28ace141f6713f4367d1ba
Reviewed-on: http://codereview.qt.nokia.com/113
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
13 years agoDoc: Fixing typo
Sergio Ahumada [Wed, 25 May 2011 12:29:28 +0000 (14:29 +0200)]
Doc: Fixing typo

Change-Id: Icd73646a9562af5fd6ae56e36ca268719d32471c
Reviewed-on: http://codereview.qt.nokia.com/112
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Wed, 25 May 2011 07:12:22 +0000 (17:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile.

13 years agoCompile.
Morten Sorvig [Wed, 25 May 2011 07:08:09 +0000 (09:08 +0200)]
Compile.

Change 0748751c brought in an extra copy of this
function.

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Wed, 25 May 2011 06:03:24 +0000 (16:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Do not continue if syncqt fails.

13 years agoDo not continue if syncqt fails.
Lincoln Ramsay [Wed, 25 May 2011 05:55:53 +0000 (15:55 +1000)]
Do not continue if syncqt fails.

If the user has set QTDIR to something other than the location of the
qtbase build directory, syncqt will fail.

This change prevents the build from continuing. Ideally, the system
should ignore the user-set QTDIR value or give an appropriate error.

Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Wed, 25 May 2011 02:44:57 +0000 (12:44 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix -nomake tests.

13 years agoFix -nomake tests.
Lincoln Ramsay [Wed, 25 May 2011 02:40:25 +0000 (12:40 +1000)]
Fix -nomake tests.

It now means "don't run qmake", not just "don't build".
This is consistent with -nomake demos and -nomake examples

Reviewed-by: Rohan Mcgovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Tue, 24 May 2011 15:11:52 +0000 (01:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (21 commits)
  Fixed line endings.
  Update licenseheader text in source files for qtbase Qt module
  New configure.exe binary
  Add -qpa option on Windows
  Use qglobal.h's VERSION number instead of hardcoded current version
  More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)
  Doc: Added some details to the accessibility events API documentation.
  Doc: Fixed qdoc warnings.
  Doc: Fixed qdoc warnings.
  Doc: Made an additional change for clarity.
  Doc: Noted that the example will not work as expected with a mouse.
  Doc: Fixed qdoc warnings.
  Doc: Applying a pending change from previous merges.
  Doc: Fixed qdoc warning.
  Doc: Fixed qdoc warnings.
  Doc: Applied pending fixes to API documentation.
  Doc: Various fixes to documentation, some based on changes in master.
  Doc: Added missing project and desktop files.
  Doc: Documented the value returned when no field can be found.
  Squashed commit of changes from the 4.8-temp branch.
  ...

13 years agoFixed line endings.
David Boddie [Thu, 28 Apr 2011 17:04:16 +0000 (19:04 +0200)]
Fixed line endings.

Conflicts:

examples/widgets/applicationicon/applicationicon.svg
examples/widgets/applicationicon/main.cpp
examples/widgets/elidedlabel/elidedlabel.cpp
examples/widgets/elidedlabel/elidedlabel.h
examples/widgets/elidedlabel/main.cpp
examples/widgets/elidedlabel/testwidget.cpp
examples/widgets/elidedlabel/testwidget.h
(cherry picked from commit 1b555a91f05b68c697b6985d1b672dc0fba5fc5a)
(cherry picked from commit c0e0bfdd451f42b10051e8064153b811080ffa0e)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
Qt Continuous Integration System [Tue, 24 May 2011 11:43:46 +0000 (21:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  QUrl auto test: include core-private headers
  QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."
  Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore

13 years agoQUrl auto test: include core-private headers
Peter Hartmann [Tue, 24 May 2011 11:34:03 +0000 (13:34 +0200)]
QUrl auto test: include core-private headers

... for the newly introduced TLD test.

Task-number: QTBUG-13601

13 years agoQUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."
Peter Hartmann [Tue, 24 May 2011 10:05:10 +0000 (12:05 +0200)]
QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."

see previous commit

Task-number: QTBUG-13601
(cherry picked from commit 9face4b88de2db6f552149d2f96257620e971a59)

13 years agoAdd QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
Robert Hogan [Tue, 24 May 2011 09:04:27 +0000 (11:04 +0200)]
Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore

Move Qt's copy of the Mozilla public suffix list from QtNetwork
to QtCore and use it to expose a new API function QUrl::topLevelDomain().
This function returns the section of the url that is a registrar-controlled
top level domain.

QtCore now exports a couple of functions to the other Qt modules: qTopLevelDomain,
a helper function for QUrl::topLevelDomain(); and qIsEffectiveTLD(), a helper
function for QNetworkCookeieJar.

The motivation for this new API is to allow QtWebKit implement a Third-Party
Cookie blocking policy. For this QtWebKit needs to know the element of the url
that is the registry-controlled TLD. Without this knowledge it would end up
blocking third-party cookies per host rather than per registry-controlled domain.

See also https://bugs.webkit.org/show_bug.cgi?id=45455

Merge-request: 1205
Task-number: QTBUG-13601
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 154402f56dcf8303a6ce601a52215226af8d31ba)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
Qt Continuous Integration System [Tue, 24 May 2011 10:01:46 +0000 (20:01 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  fix Symbian ordinals for merge request re. utf8 characters in SSL certs

13 years agoUpdate licenseheader text in source files for qtbase Qt module
Jyri Tahtela [Tue, 24 May 2011 09:34:08 +0000 (12:34 +0300)]
Update licenseheader text in source files for qtbase Qt module

Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me
13 years agofix Symbian ordinals for merge request re. utf8 characters in SSL certs
Peter Hartmann [Tue, 24 May 2011 08:29:01 +0000 (10:29 +0200)]
fix Symbian ordinals for merge request re. utf8 characters in SSL certs

Task-number: QTBUG-7912
(cherry picked from commit 83c37059df7f23be482d4ecb2c54603a3665a33d)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
Qt Continuous Integration System [Mon, 23 May 2011 15:59:03 +0000 (01:59 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  add auto test for SSL certificates containing utf8 characters
  fix coding style for merge request re. utf8 characters in SSL certs
  Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName

13 years agoadd auto test for SSL certificates containing utf8 characters
Pierre Rossi [Mon, 21 Mar 2011 17:15:01 +0000 (18:15 +0100)]
add auto test for SSL certificates containing utf8 characters

Task-number: QTBUG-7912
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 19c77b5e5e5fefedafcfbd587c3fbb4114d7c641)

13 years agofix coding style for merge request re. utf8 characters in SSL certs
Pierre Rossi [Tue, 1 Feb 2011 10:29:13 +0000 (11:29 +0100)]
fix coding style for merge request re. utf8 characters in SSL certs

fixes minor coding issues for
"Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName"

Task-number: QTBUG-7912
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 2e8d206fd9f656cd88b797c059ef83ed3df32881)

13 years agoUse OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName
Raul Metsma [Wed, 4 May 2011 15:40:15 +0000 (17:40 +0200)]
Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName

... to be able to display non-ASCII names from subject and issuerInfo.

Task-number: QTBUG-7912
Merge-request: 922
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit e5d94256be2525c24a8b61edd771662b7f2b8be3)

13 years agoNew configure.exe binary
Marius Storm-Olsen [Mon, 23 May 2011 14:24:19 +0000 (09:24 -0500)]
New configure.exe binary

13 years agoAdd -qpa option on Windows
Marius Storm-Olsen [Mon, 23 May 2011 14:19:56 +0000 (09:19 -0500)]
Add -qpa option on Windows

Done-by: owolff
Done-by: Friedemann Kleint
13 years agoUse qglobal.h's VERSION number instead of hardcoded current version
Marius Storm-Olsen [Mon, 23 May 2011 14:11:59 +0000 (09:11 -0500)]
Use qglobal.h's VERSION number instead of hardcoded current version

Done-by: Friedemann Kleint
13 years agoMore examples adjusted to Symbian and Maemo5.
David Boddie [Mon, 23 May 2011 13:10:51 +0000 (15:10 +0200)]
More examples adjusted to Symbian and Maemo5.
(cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)

13 years agoDoc: Added some details to the accessibility events API documentation.
David Boddie [Thu, 19 May 2011 12:26:36 +0000 (14:26 +0200)]
Doc: Added some details to the accessibility events API documentation.

Reviewed-by: Frederik Gladhorn
13 years agoDoc: Fixed qdoc warnings.
David Boddie [Thu, 12 May 2011 18:24:33 +0000 (20:24 +0200)]
Doc: Fixed qdoc warnings.

13 years agoDoc: Fixed qdoc warnings.
David Boddie [Wed, 11 May 2011 16:36:31 +0000 (18:36 +0200)]
Doc: Fixed qdoc warnings.

13 years agoDoc: Made an additional change for clarity.
David Boddie [Wed, 11 May 2011 13:03:52 +0000 (15:03 +0200)]
Doc: Made an additional change for clarity.

Task-number: QT-4891

13 years agoDoc: Noted that the example will not work as expected with a mouse.
David Boddie [Wed, 11 May 2011 12:41:24 +0000 (14:41 +0200)]
Doc: Noted that the example will not work as expected with a mouse.

Task-number: QT-4891

13 years agoDoc: Fixed qdoc warnings.
David Boddie [Wed, 11 May 2011 12:36:34 +0000 (14:36 +0200)]
Doc: Fixed qdoc warnings.

13 years agoDoc: Applying a pending change from previous merges.
David Boddie [Wed, 11 May 2011 12:35:09 +0000 (14:35 +0200)]
Doc: Applying a pending change from previous merges.

13 years agoDoc: Fixed qdoc warning.
David Boddie [Wed, 11 May 2011 12:25:36 +0000 (14:25 +0200)]
Doc: Fixed qdoc warning.

13 years agoDoc: Fixed qdoc warnings.
David Boddie [Wed, 11 May 2011 12:19:37 +0000 (14:19 +0200)]
Doc: Fixed qdoc warnings.

13 years agoDoc: Applied pending fixes to API documentation.
David Boddie [Tue, 10 May 2011 17:52:50 +0000 (19:52 +0200)]
Doc: Applied pending fixes to API documentation.

13 years agoDoc: Various fixes to documentation, some based on changes in master.
David Boddie [Tue, 10 May 2011 17:50:33 +0000 (19:50 +0200)]
Doc: Various fixes to documentation, some based on changes in 

13 years agoDoc: Added missing project and desktop files.
David Boddie [Tue, 10 May 2011 17:37:39 +0000 (19:37 +0200)]
Doc: Added missing project and desktop files.

13 years agoDoc: Documented the value returned when no field can be found.
David Boddie [Mon, 9 May 2011 19:08:59 +0000 (21:08 +0200)]
Doc: Documented the value returned when no field can be found.

Task-number: QTBUG-19115

13 years agoSquashed commit of changes from the 4.8-temp branch.
David Boddie [Wed, 11 May 2011 15:35:46 +0000 (17:35 +0200)]
Squashed commit of changes from the 4.8-temp branch.

13 years agoSquashed commit of the changes from the mobile-examples repository
David Boddie [Wed, 27 Apr 2011 17:16:41 +0000 (19:16 +0200)]
Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Mon, 23 May 2011 11:47:55 +0000 (21:47 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Enablers for TextInput