profile/ivi/qtbase.git
12 years agoRemoved unnecessary debug output in xcb plugin.
Samuel Rødal [Wed, 10 Aug 2011 06:33:30 +0000 (08:33 +0200)]
Removed unnecessary debug output in xcb plugin.

Change-Id: I3b354a8649971a5d8c68a0b4f6bbdf6475116d65
Reviewed-on: http://codereview.qt.nokia.com/2808
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoMade QWindow::setVisible() send show and hide events.
Samuel Rødal [Mon, 8 Aug 2011 10:39:38 +0000 (12:39 +0200)]
Made QWindow::setVisible() send show and hide events.

Change-Id: Ideae15f7bd6801d7afe2354627c0893b0b6a32ca
Reviewed-on: http://codereview.qt.nokia.com/2741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agobuild without dbus
Matthew Cattell [Tue, 9 Aug 2011 16:01:49 +0000 (18:01 +0200)]
build without dbus

Change-Id: I5af35ff094bea08c83f0e65e72efa59adac2581c
Reviewed-on: http://codereview.qt.nokia.com/2790
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemoved Q_XCB_NOOP's from QGLXContext.
Samuel Rødal [Tue, 9 Aug 2011 12:32:48 +0000 (14:32 +0200)]
Removed Q_XCB_NOOP's from QGLXContext.

QGLXContext might be used from different threads than the gui thread, so
don't trigger any XCB logging from there.

Change-Id: I96a51ebf6987749d209b447c9ae2ac8b7298bd4c
Reviewed-on: http://codereview.qt.nokia.com/2782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoRemoved QPaintDevice dependency in blitFramebuffer().
Samuel Rødal [Tue, 9 Aug 2011 12:45:13 +0000 (14:45 +0200)]
Removed QPaintDevice dependency in blitFramebuffer().

Change-Id: I7294be5c4447d7e24dda95b822a9ce7b2abbccc4
Reviewed-on: http://codereview.qt.nokia.com/2783
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoGet linux input plugin compiling by removing keyboard support
Gunnar Sletta [Tue, 9 Aug 2011 07:19:22 +0000 (09:19 +0200)]
Get linux input plugin compiling by removing keyboard support

Change-Id: I46ade27b5dde6c8d326a84e94abbbde1435889f8
Reviewed-on: http://codereview.qt.nokia.com/2765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agomake eglfs compile
Gunnar Sletta [Fri, 5 Aug 2011 11:35:57 +0000 (13:35 +0200)]
make eglfs compile

Change-Id: I724b700ed87cbc5d69647032c0c9c8e7e1d82748
Reviewed-on: http://codereview.qt.nokia.com/2689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoImplement map/unmap and force geometry EglFS
Gunnar Sletta [Mon, 8 Aug 2011 07:23:19 +0000 (09:23 +0200)]
Implement map/unmap and force geometry EglFS

Change-Id: Ia2d86e84acfeb30f41b06f106b93033fe54ed839
Reviewed-on: http://codereview.qt.nokia.com/2730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoProperly initialize window properties in xcb plugin.
Samuel Rødal [Fri, 5 Aug 2011 14:32:56 +0000 (16:32 +0200)]
Properly initialize window properties in xcb plugin.

Since 833090abb9a277 these need to be called manually.

Change-Id: Iabc263d499e724d4d39c3d8350563feb57749879
Reviewed-on: http://codereview.qt.nokia.com/2704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoGet wayland plugin working after latest QPA API changes.
Samuel Rødal [Fri, 5 Aug 2011 10:11:40 +0000 (12:11 +0200)]
Get wayland plugin working after latest QPA API changes.

Change-Id: If54e7068aaed84fe765b887250bca79c787bd8a3
Reviewed-on: http://codereview.qt.nokia.com/2684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoGet rid of missing qmake warning.
Samuel Rødal [Fri, 5 Aug 2011 07:21:34 +0000 (09:21 +0200)]
Get rid of missing qmake warning.

Change-Id: I470e89cb5b2042cda1811ef327e0703c7510fd08
Reviewed-on: http://codereview.qt.nokia.com/2683
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdded some convenience to QWindow
Gunnar Sletta [Thu, 4 Aug 2011 08:46:27 +0000 (10:46 +0200)]
Added some convenience to QWindow

Change-Id: I367f5e3f586661322184cfa5f7653814569cb6e3
Reviewed-on: http://codereview.qt.nokia.com/2611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd WindowStateChanged event.
Friedemann Kleint [Thu, 4 Aug 2011 08:36:48 +0000 (10:36 +0200)]
Add WindowStateChanged event.

Not currently considering activation state.

Change-Id: Iea9265d35536947b6cc85639bd9839e9fda69bdf
Reviewed-on: http://codereview.qt.nokia.com/2609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUndefine "slots" before including cocoa headers to make it compile
Gunnar Sletta [Thu, 28 Jul 2011 08:15:18 +0000 (10:15 +0200)]
Undefine "slots" before including cocoa headers to make it compile

Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f
Reviewed-on: http://codereview.qt.nokia.com/2328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix wayland config test
Jørgen Lind [Thu, 4 Aug 2011 06:49:01 +0000 (08:49 +0200)]
Fix wayland config test

Change-Id: Ifb002fdcec8ce359e3393c9f9fa2809e136d782c
Reviewed-on: http://codereview.qt.nokia.com/2600
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agocompile fix for compiling without ssl
Jørgen Lind [Thu, 4 Aug 2011 06:19:14 +0000 (08:19 +0200)]
compile fix for compiling without ssl

Change-Id: I48942dd437f9475c8584d5aef176f71464ae86be
Reviewed-on: http://codereview.qt.nokia.com/2598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMerge "Merge remote branch 'gerrit/master' into refactor" into refactor
Jørgen Lind [Thu, 4 Aug 2011 07:14:17 +0000 (09:14 +0200)]
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor

12 years agoInitial support for Qt using Kernel Mode-setting (KMS)
Andy Nichols [Tue, 2 Aug 2011 13:07:50 +0000 (15:07 +0200)]
Initial support for Qt using Kernel Mode-setting (KMS)

This platform plugin supports fullscreen OpenGLES2 windows on devices
that support Kernel Mode-setting.

Change-Id: I7d4077319654c13851f0ff7ec0228b7b13936382
Reviewed-on: http://codereview.qt.nokia.com/2516
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMac: fix crash when creating a new window
Richard Moe Gustavsen [Wed, 3 Aug 2011 13:08:38 +0000 (15:08 +0200)]
Mac: fix crash when creating a new window

Change-Id: I90f7bff954f3710f48d7416287bb5debafa94447
Reviewed-on: http://codereview.qt.nokia.com/2570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoQPlatformFontDatabase: Add default fonts.
Friedemann Kleint [Wed, 3 Aug 2011 12:50:40 +0000 (14:50 +0200)]
QPlatformFontDatabase: Add default fonts.

Add a default font accessor used to initalize QGuiApplication::font().
Add accessor for default font hash providing the defaults for
QApplication::font(const char *widgetClassName).

Change-Id: Ie4eb6edb251a81e81288ef480ae5550bd1125008
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-on: http://codereview.qt.nokia.com/2567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMerge remote branch 'gerrit/master' into refactor
Samuel Rødal [Wed, 3 Aug 2011 09:03:22 +0000 (11:03 +0200)]
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h

Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736

12 years agoibus depends on dbus
Jørgen Lind [Wed, 3 Aug 2011 07:05:41 +0000 (09:05 +0200)]
ibus depends on dbus

Change-Id: I9f38eaa84bf5befb6b37c2a55405d85b71cf4c95
Reviewed-on: http://codereview.qt.nokia.com/2543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix QString/QByteArray literals for MSVC2010 (compilation of tests).
Friedemann Kleint [Tue, 2 Aug 2011 13:58:48 +0000 (15:58 +0200)]
Fix QString/QByteArray literals for MSVC2010 (compilation of tests).

- Specify return type of QByteArrayLiteral/QStringLiteral lambdas.
- Define QT_UNICODE_LITERAL instead of QT_UNICODE_MARKER.

Change-Id: I8a53506887d2736b093798220b088f645f05e415
Reviewed-on: http://codereview.qt.nokia.com/2514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoMac: build fix
Richard Moe Gustavsen [Tue, 2 Aug 2011 13:17:10 +0000 (15:17 +0200)]
Mac: build fix

qtbase failed building on Mac OS 10.5 and 10.6. This patch
just rearrange some headers etc

Change-Id: If85ac69029533a195249e84f8803ced6c0ff22b6
Reviewed-on: http://codereview.qt.nokia.com/2517
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agotest: mark tst_qtconcurrentfilter as insignificant on Linux
Rohan McGovern [Tue, 2 Aug 2011 06:41:47 +0000 (16:41 +1000)]
test: mark tst_qtconcurrentfilter as insignificant on Linux

This test fails pseudorandomly, which makes the result insignificant
for the purpose of detecting regressions.

Task-number: QTBUG-20688
Change-Id: I3274953841a553e35b4eb844702868f2f9ec0525
Reviewed-on: http://codereview.qt.nokia.com/2491
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agotest: mark tst_qabstractnetworkcache as insignificant
Rohan McGovern [Tue, 2 Aug 2011 03:47:31 +0000 (13:47 +1000)]
test: mark tst_qabstractnetworkcache as insignificant

This test crashes pseudorandomly, which makes the result insignificant
for the purpose of detecting regressions.

Task-number: QTBUG-20686
Change-Id: I3079d935d46a4bcd2b119c2b9b452f0b69dccf21
Reviewed-on: http://codereview.qt.nokia.com/2479
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agoMake failure messages from tst_QSslCertificate::verify much more useful
Rohan McGovern [Tue, 2 Aug 2011 07:06:34 +0000 (17:06 +1000)]
Make failure messages from tst_QSslCertificate::verify much more useful

Changes the failure message from the previously brief:

  '(errors.count() == 0)' returned FALSE.

To the vastly more useful:

  '(errors.count() == 0)' returned FALSE.
  (errors: [ "The certificate has expired" ])

Change-Id: I587cd8ddfd3c17e273220bc95691b3dc92390547
Reviewed-on: http://codereview.qt.nokia.com/2241
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoEliminate reference to Trolltech.
Jason McDonald [Tue, 2 Aug 2011 04:20:34 +0000 (14:20 +1000)]
Eliminate reference to Trolltech.

Task-number: QTBUG-19653

Change-Id: If3c822dd59ccbdd03037068acfe902ed9688a874
Reviewed-on: http://codereview.qt.nokia.com/2482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agotest: skip some tst_qtextscriptengine tests when fonts are missing
Rohan McGovern [Tue, 2 Aug 2011 01:35:01 +0000 (11:35 +1000)]
test: skip some tst_qtextscriptengine tests when fonts are missing

This autotest may fail depending on the version of fonts which are
installed on the system.  It has no way to verify if the correct fonts
are installed, and it's unclear from where the correct version of the
fonts may be obtained.

Therefore, disable the test by default unless the user has indicated
that they have a correct setup by setting QT_HAVE_TEST_FONTS=1.

Task-number: QTBUG-20682
Change-Id: I24174520f54af6a9b2c13c9c1347f46555bce3d4
Reviewed-on: http://codereview.qt.nokia.com/2469
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoIntroduced a CONFIG option that enables declarative debug services
Thorbjørn Lindeijer [Mon, 18 Apr 2011 15:20:49 +0000 (17:20 +0200)]
Introduced a CONFIG option that enables declarative debug services

This replaces the need for applications to explicitly make a call to
enable the debug services, and rather does it in declarative.h when the
'declarative_debug' CONFIG option is used.

Done-with: Kai Koehne
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
(cherry-picked from commit 5517cc588c39814530b8bfd957821f55be42acf2)

Change-Id: If180d2b826879d6d02c7be4d3075917815ccf349
Reviewed-on: http://codereview.qt.nokia.com/2435
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agotest: remove CONFIG+=insignificant_test for tst_qgraphicstransform
Rohan McGovern [Mon, 1 Aug 2011 04:38:36 +0000 (14:38 +1000)]
test: remove CONFIG+=insignificant_test for tst_qgraphicstransform

This autotest failure is stable, so it should be marked with
QEXPECT_FAIL, not CONFIG+=insignificant_test.

Note that the test row naming had to be changed, as the test previously
created many rows of testdata with the same name, making it impossible
to skip only the broken rows.

Task-number: QTBUG-20661
Change-Id: Ie38f5dddafe7686e30eaa8ff3445310935d2cd9a
Reviewed-on: http://codereview.qt.nokia.com/2419
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agotest: fixed failure of tst_qicon
Rohan McGovern [Mon, 1 Aug 2011 06:44:09 +0000 (16:44 +1000)]
test: fixed failure of tst_qicon

This test unconditionally assumed that SVG support was available.
This is an invalid circular dependency: the test is in qtbase and
depends on qtsvg, which depends on qtbase.

Change the test so that it uses SVG support only if available.

Change-Id: Ia63ce74abdecd4bcf7a4e0714b8cb7c488e17495
Reviewed-on: http://codereview.qt.nokia.com/2426
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agotest: fixed crash of tst_qdialog and removed CONFIG+=insignificant_test
Rohan McGovern [Mon, 1 Aug 2011 23:13:38 +0000 (09:13 +1000)]
test: fixed crash of tst_qdialog and removed CONFIG+=insignificant_test

This test assumed that C++ exceptions could always be caught by the
event loop.  This is not the case when the Glib event loop is used.
Skip the relevant portion of the test in that case.

Change-Id: I6a6325c3590c810a5aba28ec98279581dcfaf55c
Reviewed-on: http://codereview.qt.nokia.com/2455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agotest: improved stability of tst_qiodevice on slow machines
Rohan McGovern [Mon, 1 Aug 2011 23:24:25 +0000 (09:24 +1000)]
test: improved stability of tst_qiodevice on slow machines

Increased network timeout from 5 to 30 seconds.

Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0
Reviewed-on: http://codereview.qt.nokia.com/2456
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agotest: fixed tst_qimagereader and removed CONFIG+=insignificant_test
Rohan McGovern [Mon, 1 Aug 2011 23:44:09 +0000 (09:44 +1000)]
test: fixed tst_qimagereader and removed CONFIG+=insignificant_test

This test assumed that Qt's available image formats could be determined
at compile time.  This was never correct since the image formats are
loaded from plugins at runtime; in Qt5 it became a real problem since
one image format (svg) was moved out of qtbase into a separate module,
turning this into a circular dependency: this test in qtbase depends on
qtsvg, which depends on qtbase.

Always check the image formats at runtime instead.

Change-Id: I5e770c5b11276c39910e34f232a2fea0a7abaa8c
Reviewed-on: http://codereview.qt.nokia.com/2457
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agotest: improved stability of tst_qwaitcondition
Rohan McGovern [Tue, 2 Aug 2011 00:22:08 +0000 (10:22 +1000)]
test: improved stability of tst_qwaitcondition

Increased thread wait timeout from 3 to 10 milliseconds, for slower or
heavily loaded machines.  (There was a previous attempt to improve
stability of this test some time ago by increasing the timeout from 1
to 3 milliseconds.)

Note that this increases the runtime of the wakeOne test from ~5 to ~14
seconds.

Change-Id: Ib556d4c949a6989fe71c11f5dc10feb2ec45c512
Reviewed-on: http://codereview.qt.nokia.com/2458
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agotest: fixed tst_qmessagebox and removed CONFIG+=insignificant_test
Rohan McGovern [Tue, 2 Aug 2011 04:52:25 +0000 (14:52 +1000)]
test: fixed tst_qmessagebox and removed CONFIG+=insignificant_test

Removed some binary compatibility tests written specifically to test a
change introduced between Qt 4.1 and 4.2.  Qt 4 and 5 are not binary
compatible, the test no longer makes sense.

Change-Id: I3e8f9b6011105e504c20bedad51af8193b102552
Reviewed-on: http://codereview.qt.nokia.com/2464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agotest: fixed spelling errors in tst_qtextscriptengine
Rohan McGovern [Tue, 2 Aug 2011 01:12:47 +0000 (11:12 +1000)]
test: fixed spelling errors in tst_qtextscriptengine

couln't -> couldn't

Change-Id: I37e86ecea74db1114fcfac93423388fae81df63d
Reviewed-on: http://codereview.qt.nokia.com/2465
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agotest: replace CONFIG+=insignificant_test with QEXPECT_FAIL for tst_qftp
Rohan McGovern [Tue, 2 Aug 2011 04:46:15 +0000 (14:46 +1000)]
test: replace CONFIG+=insignificant_test with QEXPECT_FAIL for tst_qftp

This autotest failure is entirely stable, so QEXPECT_FAIL should be used
instead of insignificant_test.

Task-number: QTBUG-20687
Change-Id: I0444e725b436fe93d30cbe54edc673594ca9b9fe
Reviewed-on: http://codereview.qt.nokia.com/2486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agotest: fixed tst_qfilesystemmodel and removed insignificant_test
Rohan McGovern [Mon, 1 Aug 2011 04:21:56 +0000 (14:21 +1000)]
test: fixed tst_qfilesystemmodel and removed insignificant_test

tst_qfilesystemmodel::sort uses some internal API to affect the sorting
behavior.  This means that part of the test must be disabled when
private symbols aren't available.

Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c
Reviewed-on: http://codereview.qt.nokia.com/2413
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoBring back QPixmap::grabWidget() (with a warning).
Friedemann Kleint [Fri, 29 Jul 2011 11:47:23 +0000 (13:47 +0200)]
Bring back QPixmap::grabWidget() (with a warning).

Change-Id: I8bbf07da474bc3ab35980b25c41c2fc4c02e8896
Reviewed-on: http://codereview.qt.nokia.com/2394
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFixed tst_qprocess, tst_qtcpserver when crashing is slow
Rohan McGovern [Mon, 1 Aug 2011 00:17:51 +0000 (10:17 +1000)]
Fixed tst_qprocess, tst_qtcpserver when crashing is slow

These tests assumed that a crashing program will always exit within
five seconds.  This is not true in some situations.  On our test macs,
enabling crash dumps can easily cause a process to take longer than
five seconds to crash.

Increased the timeout to 30 seconds.

Change-Id: Ifca240ac8d3da1346f33110653ac47de6ba2ab81
Reviewed-on: http://codereview.qt.nokia.com/2407
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agoFix tst_qgraphicsview::task255529_transformationAnchorMouseAndViewportMargins
Olivier Goffart [Fri, 29 Jul 2011 08:44:30 +0000 (10:44 +0200)]
Fix tst_qgraphicsview::task255529_transformationAnchorMouseAndViewportMargins

If we do not process the event, q->underMouse may return false in
QGraphicsViewPrivate::centerView (as the QEvent::Enter has not been
received yet.)

It was working before if by luck, the window appears under the cursor.

Change-Id: I9b4497683eae20915680297013a9c21fd6275f4b
Reviewed-on: http://codereview.qt.nokia.com/2385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoCompilation of tst_qwidget.cpp.
Friedemann Kleint [Fri, 29 Jul 2011 14:33:10 +0000 (16:33 +0200)]
Compilation of tst_qwidget.cpp.

Change-Id: Id1af7f98e1ef615f31e3512b57d727eda8b91f1f
Reviewed-on: http://codereview.qt.nokia.com/2401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix compilation with namespaced builds
Bradley T. Hughes [Fri, 29 Jul 2011 10:26:43 +0000 (12:26 +0200)]
Fix compilation with namespaced builds

Add QT_BEGIN_NAMESPACE and QT_END_NAMESPACE to src/corelib/tools/qfreelist.cpp

Change-Id: Ie01e74a3c2d9cd4de1f52a546d13398e1409c86b
Reviewed-on: http://codereview.qt.nokia.com/2390
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoSwitch to use floating point pixelSize in QRawFont completely
Jiang Jiang [Thu, 21 Jul 2011 13:09:24 +0000 (15:09 +0200)]
Switch to use floating point pixelSize in QRawFont completely

Reviewed-by: Eskil
(cherry picked from commit 500f8a4368be85a0ae8b7c46012deb0ab0c844ad)

Change-Id: I6cfebcbb68697c9bf7a5634e98a09a26928467d7
Reviewed-on: http://codereview.qt.nokia.com/2386
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoSimplify the mutexpool used in QObject.
Olivier Goffart [Tue, 26 Jul 2011 08:44:55 +0000 (10:44 +0200)]
Simplify the mutexpool used in QObject.

Since we now have QBasicMutex as a POD, we can simplify the mutexpool.
This remove the call the the Q_GLOBAL_STATIC and some others tests that
are taking CPU cycles when activating a signal.

The QMutexPool class itself can't be simplified because its mutex are
recursive mutexes, and the size is dynamic. also it is harder to get all
the mutexes initialized to 0.

Change-Id: Ie781655635907d2ad620eb189099cba14638414f
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2171
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoQMutex is now just a pointer
Olivier Goffart [Sat, 2 Jul 2011 13:13:12 +0000 (15:13 +0200)]
QMutex is now just a pointer

And added a POD QBasicMutex. (QBasicMutex* can safely be
static_cast'ed to QMutex*)

The d pointer is not anymore always a QMutexPrivate.

If d == 0x0: the mutex is unlocked
If d == 0x1: the mutex is locked, uncontended

On linux:
if d == 0x3: the mutex is locked contended, waiting on a futex
If d is a pointer, it is a recursive mutex.

On non-linux platforms:
When a thread tries to lock a mutex for which d == 0x1, it will try to
assing it a QMutexPrivated (allocated from a freelist) in order to wait
for it.

Change-Id: Ie1431cd9402a576fdd9a693cfd747166eebf5622
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2116
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoFix compilation of Minimalplugin, add documentation.
Friedemann Kleint [Fri, 29 Jul 2011 07:47:19 +0000 (09:47 +0200)]
Fix compilation of Minimalplugin, add documentation.

Change-Id: I3b40eed781905610cc3062d25dcccf5f760de1f0
Reviewed-on: http://codereview.qt.nokia.com/2382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix off-by-one error in binary search
Jiang Jiang [Thu, 28 Jul 2011 12:51:54 +0000 (14:51 +0200)]
Fix off-by-one error in binary search

This one-line change makes the binary search in QTextEngine::findItem
behave consistently with the linear search that it replaced in commit
acf678e57ed088f3e56a551cac6c7c3322005750. The new behavior seems to
cause crashes in kword (and perhaps other applications) by triggering a
logClusters assert, although I have been unable to create a unit test
that reproduces this.

Task-number: QTBUG-17209
Done-by: Dr. Robert Marmorstein <robert@narnia.homeunix.com>
Change-Id: I68b79f024e9836e1cc8b0f3514889120541eb2ea
Reviewed-on: http://codereview.qt.nokia.com/2343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFlag meta objects generated by QtDBus
Aaron Kennedy [Fri, 29 Jul 2011 03:03:52 +0000 (13:03 +1000)]
Flag meta objects generated by QtDBus

QtDBus requires a QVariant argument to be passed to property reads and
writes.  For performance reasons QtDeclarative does not do this.  By
flagging the meta object as requiring this, QtDeclarative can do so only
required.

Task-number: QTBUG-15052

Change-Id: I032c946f079523f5f10217ed56642fb315265d9f
Reviewed-on: http://codereview.qt.nokia.com/2365
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd notify signals for QIntvalidator, QDoubleValidator, QRegExpValidator
Charles Yin [Tue, 26 Jul 2011 03:46:54 +0000 (13:46 +1000)]
Add notify signals for QIntvalidator, QDoubleValidator, QRegExpValidator

Task-number:QTBUG-19956
Change-Id: I5ab5e4494189ece5b0eb1f63e73e49cb2c4e9656
Reviewed-by:Michael Brasser
Reviewed-on: http://codereview.qt.nokia.com/2147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoMake it possible to update a related table after an external update
Andy Shaw [Fri, 3 Jun 2011 06:17:40 +0000 (08:17 +0200)]
Make it possible to update a related table after an external update

When a table that is related to in a QSqlRelationalTableModel gets
updated in some way (e.g. a new row, or the data is changed) then the
related model could not be updated without recreating the
QSqlRelationalTableModel.

Now, to get around this, select() can be called on the related model to
get it to be updated.

Task-number: QTBUG-7885
Reviewed-by: Charles Yin
Reviewed-by: Michael Goddard
Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca
(cherry picked from commit 2c60a4f67f9fb02f3b711fe749b2f293a07b4e02)
Reviewed-on: http://codereview.qt.nokia.com/2224
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoAdded meta type info for Q[Explicitly]SharedDataPointer
Denis Dzyubenko [Mon, 25 Jul 2011 12:38:24 +0000 (14:38 +0200)]
Added meta type info for Q[Explicitly]SharedDataPointer

Change-Id: I1269630ae5154f7318e1c7ae9fa2014a15234bf4
Reviewed-on: http://codereview.qt.nokia.com/2110
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoGet rid of compiler warnings with MSVC
Olivier Goffart [Wed, 27 Jul 2011 17:01:15 +0000 (19:01 +0200)]
Get rid of compiler warnings with MSVC

Change-Id: Ibd027c502a5b8bcbfc6dae71c4f244f1080d4064
Reviewed-on: http://codereview.qt.nokia.com/2303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoEmit selectionChanged signals when input method alters selection.
Andrew den Exter [Mon, 25 Jul 2011 06:58:46 +0000 (16:58 +1000)]
Emit selectionChanged signals when input method alters selection.

Mark the selection as dirty if an input method event contains a
selection and emit selectionChanged() if it's not emitted by
finishChange().

Task-number: QTBUG-19731

Change-Id: Ief6f06f40071f64dae4db0ba365676c059a39c7e
Reviewed-on: http://codereview.qt.nokia.com/2081
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoMake QPlatformIntegration not have a factory for eventdispatcher
Jørgen Lind [Wed, 27 Jul 2011 14:54:53 +0000 (16:54 +0200)]
Make QPlatformIntegration not have a factory for eventdispatcher

but rather an accessor for the guiThreadEventDispatcher

Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413
Reviewed-on: http://codereview.qt.nokia.com/2321
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix typo in padnavigator example docs
Jason McDonald [Tue, 26 Jul 2011 05:22:37 +0000 (15:22 +1000)]
Fix typo in padnavigator example docs

Change-Id: Ifde02273107441add4eb77d8fc092eac2cc2c798
Reviewed-on: http://codereview.qt.nokia.com/2150
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix obsolete contact email
Jason McDonald [Tue, 26 Jul 2011 06:11:03 +0000 (16:11 +1000)]
Fix obsolete contact email

Replace the old Trolltech contact email address with the current Qt
contact email address.

Task-number: QTBUG-20370
Change-Id: If5b9c3a044e1ee46264548eea456c704ced8e363
Reviewed-on: http://codereview.qt.nokia.com/2153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoconfigure: fixed setting of CFG_MAC_ARCHS for mac qpa builds
Rohan McGovern [Thu, 28 Jul 2011 01:48:28 +0000 (11:48 +1000)]
configure: fixed setting of CFG_MAC_ARCHS for mac qpa builds

Previously, the mac arch was only put into qconfig.pri for carbon
and cocoa builds.  Make sure it is also available for qpa builds.
This is needed for projects which need to select architecture-specific
sources in their .pro file.

Change-Id: I5f72e3b699b11dafc4dae052620913f2b9b81d0a
Reviewed-on: http://codereview.qt.nokia.com/2313
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoMark tst_qsslcertificate::verify with QEXPECT_FAIL
Rohan McGovern [Wed, 27 Jul 2011 22:41:50 +0000 (08:41 +1000)]
Mark tst_qsslcertificate::verify with QEXPECT_FAIL

Test started to fail, complains about outdated SSL certificate.

Task-number: QTBUG-20582
Change-Id: I2622375d9bc7b446dbbc18f72403896c60a8dee1
Reviewed-on: http://codereview.qt.nokia.com/2307
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
12 years agoInitial OpenWFD support
Jørgen Lind [Wed, 27 Jul 2011 13:10:16 +0000 (15:10 +0200)]
Initial OpenWFD support

Change-Id: I06f71073ec58af1a431edb997f3a359800320196
Reviewed-on: http://codereview.qt.nokia.com/2288
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake it possible to use QSocketNotifier in Lighthouse plugins
Jørgen Lind [Thu, 21 Jul 2011 11:11:55 +0000 (13:11 +0200)]
Make it possible to use QSocketNotifier in Lighthouse plugins

The idea is that now the plugin can register the event dispatcher
in its constructor, so it can freely use QSocketNotifier or what not.

If the plugin choses not to do so, then the createFunction will be
called at a later point.

Change-Id: I75fb2ee4180d9619ac94e75fbcf1efd7a2deecbc
Reviewed-on: http://codereview.qt.nokia.com/2287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMore graceful choosing of EGL configs.
Samuel Rødal [Wed, 27 Jul 2011 10:07:23 +0000 (12:07 +0200)]
More graceful choosing of EGL configs.

If someone asks for a depth buffer of size 32, we should try to give
them a smaller depth buffer if none of that size is available. Also,
don't unconditionally read the alpha size of the  configure
attributes, since it might have been removed when reducing the config.

Change-Id: If2f9d49c1cc3ded015384f9551b19cd15c523ce3
Reviewed-on: http://codereview.qt.nokia.com/2269
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdded Q_GUI_EXPORT for some internal symbols needed in QtWidgets.
Samuel Rødal [Tue, 26 Jul 2011 15:04:08 +0000 (17:04 +0200)]
Added Q_GUI_EXPORT for some internal symbols needed in QtWidgets.

Change-Id: I1e3ba974ebb1200095ddd32a905acaab3cea1c1e
Reviewed-on: http://codereview.qt.nokia.com/2207
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoRemove nativeimagehandleprovider.
Samuel Rødal [Tue, 26 Jul 2011 12:13:30 +0000 (14:13 +0200)]
Remove nativeimagehandleprovider.

Symbian / OpenVG are currently not supported in Qt 5.

Change-Id: I0a0e1dd9ac3f48c62c0e30baa4d32a087c15a766
Reviewed-on: http://codereview.qt.nokia.com/2194
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoQWindow: Do not call setters for window state, type etc in creation.
Friedemann Kleint [Tue, 26 Jul 2011 12:43:53 +0000 (14:43 +0200)]
QWindow: Do not call setters for window state, type etc in creation.

Remove the need to do housekeeping and comparison of window types,
etc in the platform window setters. They can safely assume the flags
have really changed and something (potentially recreating the
window) has to be done.
createPlatformWindow() must then query all parameters from
QWindow and apply them.

Change-Id: I497060ba46a955cad1fa3cbb5eb91438a420b80e
Reviewed-on: http://codereview.qt.nokia.com/2198
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRevert "test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux"
Michael Goddard [Tue, 26 Jul 2011 10:10:01 +0000 (12:10 +0200)]
Revert "test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux"

This reverts commit 33cb4ff4d45ddf389a7c676b36ddaf45f20b2f37

Test still seems unstable :(

Change-Id: I20d9c393e1553abba2a335532bee4e3ba716d8ce
Reviewed-on: http://codereview.qt.nokia.com/2179
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoTry to make sure the config test script is installed.
Michael Goddard [Mon, 25 Jul 2011 12:07:54 +0000 (22:07 +1000)]
Try to make sure the config test script is installed.

And try to fail a bit more gracefully if it isn't.

Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221
Reviewed-on: http://codereview.qt.nokia.com/2109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoTighten up the config test success checking.
Michael Goddard [Mon, 25 Jul 2011 00:10:54 +0000 (10:10 +1000)]
Tighten up the config test success checking.

Try a lot harder to remove the old $TARGET output, since make
clean isn't sufficient.  Also fix a bug in program invocation
that was hidden because of the stale files.

Change-Id: I0a365409d81efb74c5836eaf9f129fd9b2cca77e
Reviewed-on: http://codereview.qt.nokia.com/2052
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse QFreeList for timer id allocation
Bradley T. Hughes [Tue, 19 Jul 2011 14:27:42 +0000 (16:27 +0200)]
Use QFreeList for timer id allocation

The timer id allocator doesn't need a paylod (hence T=void), but we want
to tune the allocation 'strategy.' We allocate a maximum of 6 blocks
(like before), but the first block is twice as large as before and is
not static writable anymore. The initial value is 1 (0 is not a valid
timer id), but otherwise the constants are the same as the defaults.

Change-Id: Ied49ff4d7a6a8d69bc8c7bfa5475e4111446659f
Reviewed-on: http://codereview.qt.nokia.com/2161
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoAdd QFreeList as an internal class
Bradley T. Hughes [Tue, 19 Jul 2011 13:53:32 +0000 (15:53 +0200)]
Add QFreeList as an internal class

This is a generic implementation of the lock-free free list found in
qabstracteventdispatcher.cpp. Use next() to get the next free entry in
the list, and release(id) when done with the id.

This version is templated and allows having a payload which can be
accessed using the id returned by next(). The payload is allocated and
deallocated automatically by the free list, but *NOT* when calling
next()/release(). Initialization should be done by code needing it after
next() returns. Likewise, cleanup should happen before calling
release(). It is possible to have use 'void' as the payload type, in
which case the free list only contains indexes to the next free entry.

Autotest included.

Change-Id: Ifd12a961d47f3d76593c45061f72e55c9b80a43b
Reviewed-on: http://codereview.qt.nokia.com/2160
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoCompile fix for QImage autotest.
Samuel Rødal [Tue, 26 Jul 2011 09:54:15 +0000 (11:54 +0200)]
Compile fix for QImage autotest.

QImage::numBytes() is deprecated, QImage::byteCount() should be used
instead.

Change-Id: I0f885b91a49de59eb371da931bb64d2d57fcc0d0
Reviewed-on: http://codereview.qt.nokia.com/2177
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoGet the eglfs plugin compiling.
Samuel Rødal [Mon, 25 Jul 2011 12:55:45 +0000 (14:55 +0200)]
Get the eglfs plugin compiling.

Change-Id: I5addb1a2593a670d559b9fbf9183f52af410895b
Reviewed-on: http://codereview.qt.nokia.com/2176
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMake QTabWidget::tabBar() public.
David Faure [Tue, 26 Jul 2011 09:40:18 +0000 (11:40 +0200)]
Make QTabWidget::tabBar() public.

This is very much useful to be able to write things like
myTabWidget->tabBar()->setSelectionBehaviorOnRemove( QTabBar::SelectPreviousTab );
without subclassing QTabWidget.

Change-Id: Ic7c42709ea1086631d37f90f184b058c4b6e9601
Merge-request: 3
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2172
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoSet an object name matching the Widget on QWidgetWindow.
Friedemann Kleint [Tue, 26 Jul 2011 08:32:30 +0000 (10:32 +0200)]
Set an object name matching the Widget on QWidgetWindow.

To aid debugging.

Change-Id: I841a59a60a0de504eef140debc5e55ee5f15d7f7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2167
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRetrieve QPlatformScreen from top level when querying widget metrics.
Friedemann Kleint [Tue, 26 Jul 2011 08:30:56 +0000 (10:30 +0200)]
Retrieve QPlatformScreen from top level when querying widget metrics.

Check for 0 and use primary screen as default.

Change-Id: Ib4d0d3f507e7fb17687f5e126b49f98cfdbead6c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2166
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix MSVC compiler warning.
Friedemann Kleint [Tue, 26 Jul 2011 06:39:43 +0000 (08:39 +0200)]
Fix MSVC compiler warning.

class/struct mismatch.

Change-Id: Ifaecc4ba4baeceb41fffba84678466faf48469bc
Reviewed-on: http://codereview.qt.nokia.com/2156
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindows: fixed qtmain.lib not going to `lib' directory
Rohan McGovern [Tue, 26 Jul 2011 00:06:45 +0000 (10:06 +1000)]
Windows: fixed qtmain.lib not going to `lib' directory

`load(qt_module_config)' clobbers DESTDIR.
Rearrange the order so that our setting of DESTDIR works as intended.

Change-Id: Id6f02e9fb55069fae9b2a75c9d0f51578b84f4d1
Reviewed-on: http://codereview.qt.nokia.com/2130
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoImprove doc to avoid row vs col major confusion.
Sarah Smith [Mon, 25 Jul 2011 04:38:08 +0000 (14:38 +1000)]
Improve doc to avoid row vs col major confusion.

There has been a few reports of user confusion from the fact that the
constData and data functions return results in column-major format.
There is nothing in the doc anywhere that states this, and nothing
states that the class is especially for OpenGL which would give a clue
at least.

Change-Id: I3a9afde0fbeb8b9d2bcba6a387620b60a56774b9
Reviewed-on: http://codereview.qt.nokia.com/2066
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
12 years agoEmit selectionChanged signals when input method alters the selection.
Andrew den Exter [Mon, 25 Jul 2011 05:48:01 +0000 (15:48 +1000)]
Emit selectionChanged signals when input method alters the selection.

Check if the input method removes the selection and force emit
selectionChanged if it sets a new selection.

Task-number: QTBUG-19727
Reviewed-by: Martin Jones
Change-Id: Ic8ea1044d0917aac4e52368f431ac9e5c7db7c56
Reviewed-on: http://codereview.qt.nokia.com/2076
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoUpdate cursor position when selection is reversed.
Andrew den Exter [Mon, 25 Jul 2011 06:28:07 +0000 (16:28 +1000)]
Update cursor position when selection is reversed.

A reversed selection will have the same resolved start and end
positions but a different cursor position so testing the end points
alone doesn't guarantee the selection is the same.

Task-number: QTBUG-19456
Reviewed-by: Martin Jones
Change-Id: I516e5a501ec878d673f21e54d688fd2d21b624ef
Reviewed-on: http://codereview.qt.nokia.com/2080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agotest: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux
Sergio Ahumada [Mon, 25 Jul 2011 18:32:45 +0000 (20:32 +0200)]
test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux

Change-Id: I86570148f1fcbf2932c6314b0a6c666c02a3554f
Reviewed-on: http://codereview.qt.nokia.com/2127
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoLighthouse: Provide default plugin.
Friedemann Kleint [Mon, 25 Jul 2011 15:09:58 +0000 (17:09 +0200)]
Lighthouse: Provide default plugin.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: I13e78c499f77ac6ad034e61488fc6ef00e2e2be8
Reviewed-on: http://codereview.qt.nokia.com/2124
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCompile fix.
Friedemann Kleint [Mon, 25 Jul 2011 15:08:00 +0000 (17:08 +0200)]
Compile fix.

Change-Id: I8eef93e05ef4938111d2fb21c2ade019b578ab11
Reviewed-on: http://codereview.qt.nokia.com/2123
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCompile fix.
Friedemann Kleint [Mon, 25 Jul 2011 15:03:47 +0000 (17:03 +0200)]
Compile fix.

Change-Id: Iab8abc6ebd580f8bafc08b250244e72907c253f4
Reviewed-on: http://codereview.qt.nokia.com/2122
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCompile fix.
Samuel Rødal [Mon, 25 Jul 2011 14:46:38 +0000 (16:46 +0200)]
Compile fix.

Added missing qscreen.cpp.

Change-Id: Id79a6a12aca0758fdb1a168d63969940111f03dd
Reviewed-on: http://codereview.qt.nokia.com/2119
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdd the missing function in bootstrap
Olivier Goffart [Mon, 25 Jul 2011 11:12:00 +0000 (13:12 +0200)]
Add the missing function in bootstrap

(required for the metatype changes)

Change-Id: I0e3c73e7828493b4f03ec6439ec80b1c8c2bf377
Reviewed-on: http://codereview.qt.nokia.com/2105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agotestlib: fix include of `qttestversion.h' in testlib.pro
Sergio Ahumada [Sun, 24 Jul 2011 14:10:33 +0000 (16:10 +0200)]
testlib: fix include of `qttestversion.h' in testlib.pro

The actual file defined in `sync.profile' and generated
by 'syncqt' is `qttestversion.h' instead of `qttestlibversion.h'

Change-Id: I90ed2d5b7cd9f98855a878c97afceced01e7e8b0
Reviewed-on: http://codereview.qt.nokia.com/2050
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoDrag and drop support in Wayland plug-in.
Laszlo Agocs [Mon, 25 Jul 2011 10:01:04 +0000 (13:01 +0300)]
Drag and drop support in Wayland plug-in.

Change-Id: I5e4448a9b3d3df9e3a12733386079031be340a42
Reviewed-on: http://codereview.qt.nokia.com/2101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd drag and drop events to QWindowSystemInterface.
Laszlo Agocs [Mon, 25 Jul 2011 07:09:38 +0000 (10:09 +0300)]
Add drag and drop events to QWindowSystemInterface.

For non-desktop platforms these are better suited and are more
QPA style than relying purely on QDragManager/QSimpleDrag/sending
drag events directly to the windows.

Change-Id: Id466830cf83427b3d86925602086a858e8f713e5
Reviewed-on: http://codereview.qt.nokia.com/2084
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd initial support for bitmap version 4/5 headers.
Ilya Konkov [Fri, 22 Jul 2011 11:25:46 +0000 (13:25 +0200)]
Add initial support for bitmap version 4/5 headers.

The headers are just skipped, information stored in them is ignored.

Merge-request: 824

Change-Id: I48f37757114ed83cd5c92cb3d5a43eeaca4b91b3
Reviewed-on: http://codereview.qt.nokia.com/2108
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoPixmap cursor support in QWaylandCursor.
Laszlo Agocs [Mon, 25 Jul 2011 09:57:57 +0000 (12:57 +0300)]
Pixmap cursor support in QWaylandCursor.

Change-Id: I7075229584e9705fae63679b5512c11fd8535797
Reviewed-on: http://codereview.qt.nokia.com/2100
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoSupport non-desktop platforms better with QDragManager.
Laszlo Agocs [Mon, 25 Jul 2011 07:12:39 +0000 (10:12 +0300)]
Support non-desktop platforms better with QDragManager.

By default QDragManager brings in a number of "desktopisms" (e.g. that
a drag is always controlled by mouse events, can be cancelled with some
key press, etc.), these assumptions are not necessarily suitable for
all QPA platforms. Therefore there has to be a way to disable this
built-in event handling, and let the QPlaformDrag decide how the drag
is controlled and when it ends.

Change-Id: Ie9fa2df7ba1e30dd1c6e2cff406490e36be73c4f
Reviewed-on: http://codereview.qt.nokia.com/2085
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix for not calling QPlatformCursor's pointerEvent.
Laszlo Agocs [Mon, 25 Jul 2011 07:02:09 +0000 (10:02 +0300)]
Fix for not calling QPlatformCursor's pointerEvent.

The code to pass mouse events to platform cursors is there in 4.8,
however it went missing in refactor. This patch restores it.

Change-Id: I7873c892c1ae907fc084d3f00f7d4e5a6293ba4d
Reviewed-on: http://codereview.qt.nokia.com/2083
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdded workable QScreen API on top of QPlatformScreen.
Samuel Rødal [Thu, 21 Jul 2011 11:50:28 +0000 (13:50 +0200)]
Added workable QScreen API on top of QPlatformScreen.

QPlatformIntegration::screens() no longer has to be implemented,
implementations should call QPlatformIntegration::screenAdded() for each
screen instead. This is for being able to support adding screens at
run-time later on, by connecting it to a signal in QGuiApplication.

The QGuiGLContext API has changed a bit, by not sending in all the
parameters in the constructor but instead having a create() function.
The createPlatformGLContext() factory in QPlatformIntegration takes a
QGuiGLContext * instead of a QSurfaceFormat and a share context, similar
to how the window and backing store factory functions work.

The XCB plugin has experimental support for connecting to multiple X
displays simultaneously, creating one or more QScreen for each.

Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f
Reviewed-on: http://codereview.qt.nokia.com/2103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoChanged QLibrary::resolve() to return a function pointer.
Kim Motoyoshi Kalland [Thu, 21 Jul 2011 16:47:26 +0000 (18:47 +0200)]
Changed QLibrary::resolve() to return a function pointer.

According to the C++ standard, there is no guarantee that
you can cast between function pointers and void pointers
without data loss (section 5.2.10-6).

Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd
Reviewed-on: http://codereview.qt.nokia.com/1995
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoMaking cached glyphs drawing check clearer
Jiang Jiang [Mon, 25 Jul 2011 08:52:48 +0000 (10:52 +0200)]
Making cached glyphs drawing check clearer

Putting the logic inside supportsTransformation() is a bit confusing and
that name is misleading.

Also move the same check in GL2 paint engine to the same place.

Change-Id: I182500a0ff375122e6be966b7ce2495c84d113d0
Reviewed-on: http://codereview.qt.nokia.com/2096
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoBuild fix for examples.
Friedemann Kleint [Mon, 25 Jul 2011 08:07:13 +0000 (10:07 +0200)]
Build fix for examples.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: I36f5a4088a39673a8e74a4d53ac83a42696af096
Reviewed-on: http://codereview.qt.nokia.com/2095
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoDelay masking the last character in Password echo mode.
Andrew den Exter [Mon, 25 Jul 2011 03:25:15 +0000 (13:25 +1000)]
Delay masking the last character in Password echo mode.

If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal.  If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.

Task-number: QTBUG-17003
Reviewed-by: Martin Jones
(cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971)

Conflicts:

src/declarative/graphicsitems/qdeclarativetextinput.cpp
tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp

Change-Id: I3683223189b7176e4ef5081ee315c95a0efb9cfe
Reviewed-on: http://codereview.qt.nokia.com/2060
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>