Commit Graph

1724 Commits

Author SHA1 Message Date
Gunnar Sletta
6136a792bc Enable multisampling and swap interval by default on cocoa
Change-Id: If3d1939e6196f5aa6654645d20dab7ad251046fa
Reviewed-on: http://codereview.qt.nokia.com/3138
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-18 10:14:35 +02:00
Morten Sorvig
48ba733fcf Set the style mask manually.
Looks like the window flags conversion code from
Qt 4 is not working, set a style mask suitable
for qmlscene for now.

Change-Id: I5e672f586045a0f0403f6b75252f0029c8d8a205
Reviewed-on: http://codereview.qt.nokia.com/2956
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:52:15 +02:00
Morten Sorvig
4e6c4d50a5 Fix crash-on-exit in qmlscene.
Take control over NSWindow deletion to make sure
it's lifetime matches that of the QCocoaWindow.

Change-Id: Ia10006d814345356e6aebe7fa1f9a0e012535786
Reviewed-on: http://codereview.qt.nokia.com/2960
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:50:06 +02:00
Morten Sorvig
c9d1adb7fa Create NSWindow subclass.
Allows us to override canBecomeKeyWindow etc.

Change-Id: Ia74006ac85acb98e8a0fe0a8cdc8e5e0b9aee5c4
Reviewed-on: http://codereview.qt.nokia.com/2955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:46:57 +02:00
Morten Sorvig
6fce65f871 Cocoa: Remove autorelease warnings from qmlscene.
The SG Canvas render thread was creating a
QCocoaGLContext without an autorelease pool in
place.

Change-Id: I08882f42efdf905107497e8be21f2a2d20c3c4cf
Reviewed-on: http://codereview.qt.nokia.com/2911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:44:48 +02:00
Rohan McGovern
8d16fcb912 test: marked tst_qfocusevent as insignificant on all platforms
This was known to be unstable on mac, but appears to be unstable on
Linux also.

Task-number: QTBUG-20987
Change-Id: I760533c32cf13d24f8428f120813eb590b202182
Reviewed-on: http://codereview.qt.nokia.com/3131
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
06bfd1feda test: fixed failure of tst_qstylesheetstyle on qpa
Wait for window shown on _all_ platforms, not just X11.

QEXPECT_FAIL a test which relies on QCursor::setPos, which is currently
unimplemented for qpa (QTBUG-20753).

Change-Id: I72412476afc7e52ccb6cab4306ff791b7e7d8d93
Reviewed-on: http://codereview.qt.nokia.com/3118
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
06657ea84b test: fixed tst_qeventloop and removed CONFIG+=insignificant_test
Throwing C++ exceptions through the event loop doesn't work if the Glib
event loop is used, so conditionally skip that part of the test.

Change-Id: Ic27ebf4eb75bd1cf7c7e35f371f29bcfc0e1844a
Reviewed-on: http://codereview.qt.nokia.com/2471
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
66fbd24849 test: skipped unstable portion of tst_qcssparser on qpa
This test unstably fails because font lookup is somewhat broken for qpa.

Task-number: QTBUG-20986
Change-Id: Id4ebd35e979d8837d32b58e5ed9c1df3ac15827a
Reviewed-on: http://codereview.qt.nokia.com/3130
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
0c9bd28298 test: mark tst_qrawfont as expected failure on qpa
The necessary font handling code for qrawfont currently seems to be
unimplemented for all qpa backends.

Task-number: QTBUG-20976
Change-Id: I2b5c511936892e2754c0ee809b7a558f44d1d132
Reviewed-on: http://codereview.qt.nokia.com/3116
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
3817a82ebd test: fixed XPASS from tst_qstatictext on qpa
These tests were written to compare two different methods of drawing
text, to ensure the result was the same.  However, if _both_ methods
turned out to be complete no-ops, the test would unexpectedly pass, as
it never verified that anything was painted.  Add additional
verification steps and QEXPECT_FAIL them on qpa for now.

Task-number: QTBUG-20977

Change-Id: I1ce1b7c2bcd683fc9eeaeb8d1483268e56f5cf08
Reviewed-on: http://codereview.qt.nokia.com/3117
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
1ed19b09ce test: mark tst_qsystemtrayicon as expected failure for qpa
QSystemTrayIcon is unimplemented for qpa.

Task-number: QTBUG-20978
Change-Id: I63703b96e3d4572bae722120774de1565d475414
Reviewed-on: http://codereview.qt.nokia.com/3119
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
7789b872da test: mark tst_qtextlayout as insignificant for qpa, xcb
This autotest segfaults in this configuration.

Task-number: QTBUG-20979
Change-Id: I7f038416d9333b690695f48e4ad01d52767f45cd
Reviewed-on: http://codereview.qt.nokia.com/3120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
ee934d6c4c tests: disabled failing qsharedmemory, qsystemsemaphore tests
The `lackey' helper app was disabled by
ccd5228a93, but the tests which depend on
it weren't disabled - so, of course, they fail.

None of these tests will work until the circular dependency is fixed
(the tests are in qtbase and they depend on qtscript which depends on
qtbase).

Change-Id: I8e41b4182f5ea57a71ec810a30a21ba1c7217db3
Reviewed-on: http://codereview.qt.nokia.com/3122
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
0f1aee9963 test: fixed failure of tst_qhostinfo
Doing an async exit of the test event loop is unsafe - it means that
a call to exitLoop may be left pending from one testfunction, causing
future testfunctions to fail.  This in fact was happening for the
multipleDifferentLookups testfunction, which was running the event loop
for two milliseconds at a time until a certain amount of lookups was
done.  It was common for the loop to timeout after the lookup had
completed but before the async exitLoop had been processed.

Make it simple, do a synchronous exitLoop.

Change-Id: I2ffe6989bddc091ddd42b218a75f7a8ff160cf53
Reviewed-on: http://codereview.qt.nokia.com/3124
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
6e7ad733a4 test: marked tst_macgui as insignificant
This autotest sometimes passes and sometimes fails, making its result
insignificant for the purpose of detecting regressions.

Task-number: QTBUG-20984
Change-Id: I1454649384b60501be0bec238dfb18cfc85d5f54
Reviewed-on: http://codereview.qt.nokia.com/3129
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 08:05:38 +02:00
Rohan McGovern
f61c496757 test: mark tst_qcombobox as expected failure for qpa
This test fails on qpa because it uses QCursor::setPos, which is
unimplemented.

Task-number: QTBUG-20753
Change-Id: I8b77261e9ddfa8f57cebdbd83c93a367a8cf8bea
Reviewed-on: http://codereview.qt.nokia.com/3128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 05:54:43 +02:00
Rohan McGovern
c475870cb6 tests: mark expected failures in qsslsocket_onDemandCertificates
Task-number: QTBUG-20983
Change-Id: I5db2a92352037721802c127f2b47b52a514e0bfc
Reviewed-on: http://codereview.qt.nokia.com/3127
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 05:53:42 +02:00
Rohan McGovern
becba0e71f test: marked tst_qhttpnetworkconnection as insignificant
This test crashes sometimes (but not always), making its result
insignificant for the purpose of detecting regressions.

Task-number: QTBUG-20981
Change-Id: I65e9c449ef342fad17be2364964774f229970aaa
Reviewed-on: http://codereview.qt.nokia.com/3125
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 05:53:30 +02:00
Rohan McGovern
f94410f104 test: marked tst_qsocketnotifier failures as expected
Task-number: QTBUG-20982
Change-Id: Ie53ea9733dc357176ec829d3df971760c49afdbd
Reviewed-on: http://codereview.qt.nokia.com/3126
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 05:48:39 +02:00
Rohan McGovern
508433df15 Stabilize autotests using QTest::qWaitForWindowShown on non-X11.
X11 is currently the only platform with a "real" implementation of
QTest::qWaitForWindowShown.  All others merely process events for some
fixed interval, and assume that this is sufficient for the window to be
placed.  In practice, the current interval is too short for slower
machines.

Change-Id: I956cd747d0b30577f5072a9a08da88dabc76906c
Reviewed-on: http://codereview.qt.nokia.com/3060
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-08-18 05:09:42 +02:00
Rohan McGovern
4482dcda21 test: mark tst_qwindowsurface as expected failure on qpa
This test fails on qpa because QPixmap::grabWindow is not implemented
for that platform.

Task-number: QTBUG-20863
Change-Id: I19afdac231922113c1b491dee27c2ea91e121b85
Reviewed-on: http://codereview.qt.nokia.com/3123
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-18 04:32:00 +02:00
Rohan McGovern
8455b13fee test: fixed failure of tst_qgridlayout on small screens for non-QWS
This test will fail if the window manager doesn't give the widget the
geometry it requested.  The test was verifying this precondition, but
only on QWS.  It doesn't make sense to limit this check to QWS,
as  other platforms can have small screens too.

Change-Id: I3fec905c28ac2f85ebfd621f84f2269a673e318e
Reviewed-on: http://codereview.qt.nokia.com/3061
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-17 17:46:37 +02:00
Rohan McGovern
7a16085a0f test: mark qlistview as insignificant for qpa, xcb
The test fails on some qpa, xcb configurations, but not others.
The difference between the passing and failing configurations is
unknown.

Task-number: QTBUG-20956
Change-Id: I0dc7c3e598ce1116ef5f2280d9285dda82f14f10
Reviewed-on: http://codereview.qt.nokia.com/3064
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-17 17:46:37 +02:00
Frederik Gladhorn
a3ce0eb6f1 When asking for relations, don't crash on children that don't return an interface.
Reviewed-by: Jan-Arve
(cherry picked from commit a816cb0d26ebcef54e9e61c72455509edf6c44b9)

Change-Id: I8fed57eb0dfd5b67dee440b19c0ad5b9d7b3ae2d
Reviewed-on: http://codereview.qt.nokia.com/3020
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-17 13:34:28 +02:00
Olli Werwolff
c402d35df8 Readded (and fixed) WindowsXP and -Vista styles
There are still issues in WindowsVista style and qwizard_win's icon will
not be shown but these will be fixed in upcoming commits.

Change-Id: I22705694f07bea7461333b053804a09bab661706
Reviewed-on: http://codereview.qt.nokia.com/3073
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-17 13:30:28 +02:00
Gunnar Sletta
a957a88542 compile after removal of OpenGL 1 paint engine
Change-Id: Idf030ef627329f940e8a1e0a2b98d49b11e8446c
Reviewed-on: http://codereview.qt.nokia.com/3087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-17 12:15:31 +02:00
Paul Olav Tvete
78056064cc Build fix after setPreferredPaintEngine was removed
Change-Id: I286529e0e1917ee3c808eba7dad0957dd4d8194f
Reviewed-on: http://codereview.qt.nokia.com/3083
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-17 11:59:53 +02:00
Gunnar Sletta
801450dfa3 Make configure work again..
Change-Id: I40d840c079a89fd127cf2d8ab97c1f8f3cb6525f
Reviewed-on: http://codereview.qt.nokia.com/3065
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-17 08:21:29 +02:00
Lincoln Ramsay
29a8761cd8 Report an error when the version header can't be written
If sync.profile points to a location that does not exist in the
%modules section, the version header cannot be written.

Report the error clearly so this problem can be identified.

Change-Id: Ib681087f46362487ffb621221d33cf9b7e54df2f
Reviewed-on: http://codereview.qt.nokia.com/2761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-17 08:01:47 +02:00
Rohan McGovern
94b6f1ad52 test: skip tst_QMenu::pushButtonPopulateOnAboutToShow() for picky WM
We are trying to test the case of having a widget right next to the edge
of the screen, but the window manager is likely to forbid this geometry
in many cases.  When this happens, we can't continue the test.

Change-Id: I6bce2263bdf444221c5303e83d70a254bbb9194c
Reviewed-on: http://codereview.qt.nokia.com/2892
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-17 03:34:12 +02:00
Samuel Rødal
0d5170256c Get rid of OpenGL 1.x engine and platform code from QtOpenGL.
Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390
Reviewed-on: http://codereview.qt.nokia.com/3006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-16 15:44:26 +02:00
Samuel Rødal
06f6b71ba4 Don't set platform input context if it's not properly created.
Prevent xcb applications from failing to launch when IBus is not
initialized correctly.

Change-Id: I8425403e02d0eb5401f8d8bb0d012b53ab9400d9
Reviewed-on: http://codereview.qt.nokia.com/3044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
2011-08-16 15:38:48 +02:00
Frederik Gladhorn
7465b55d9c Remove more inconsistencies with invisible.
Visible status should not influence child count and
other properties.

Reviewed-by: Jan-Arve
(cherry picked from commit b6a6953d21a95c402e8a5010c1ea5131509eeea3)

Change-Id: I854349bfe48ab3d81bb9eee284965461b1e66aef
Reviewed-on: http://codereview.qt.nokia.com/3019
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:07:45 +02:00
Frederik Gladhorn
fe59af2c00 QAccessibleToolButton::text should return accessibleName if set.
This was most likely a copy and paste error.

Reviewed-by: Denis Dzyubenko
(cherry picked from commit e29ef45e404dbe888c0848eb28317a10b2aff768)

Change-Id: I55dec5b9d101f9015f97cf453dc804d3cc22db8d
Reviewed-on: http://codereview.qt.nokia.com/3018
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:07:27 +02:00
Frederik Gladhorn
ddb0b4a838 Remove stray semicolon.
Reviewed-by: TrustMe
(cherry picked from commit f045367df74fbb5befeef81afa9102d0a6e59d54)

Change-Id: Idcdb0115606447d74a49f2dd1101ad0ad7745db0
Reviewed-on: http://codereview.qt.nokia.com/3017
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:07:09 +02:00
José Millán Soto
5622e32ac9 Changing cursor position in all boundaries
Merge-request: 1242
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit 97c59df43d821e8e1784749e72f8ee7f90d46da2)

Change-Id: Iccb872281a443e57ff3e492911490a8d7495bbdc
Reviewed-on: http://codereview.qt.nokia.com/3004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:06:40 +02:00
Samuel Rødal
1ff94e3148 Get rid of unused convenience class in QtOpenGL.
QGLContextResource is no longer used, QGLContextGroupResource should be
preferable in all situations.

Change-Id: I7c7b90686959ced9fa34e278ef5747a7c49a5b03
Reviewed-on: http://codereview.qt.nokia.com/3005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-16 13:53:13 +02:00
Kai Koehne
d6d3a32a68 Configure: Set separate_debug_info for all modules
separate_debug_info was previously stored in .qmake.cache, and
therefore only affected qtbase. Store it as a QT_CONFIG setting instead,
and add it to CONFIG for all Qt plugins and modules.

Change-Id: I940c8cb30f1c42c85f4d0342e6a482f20677ff04
Reviewed-on: http://codereview.qt.nokia.com/2975
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-08-16 11:48:43 +02:00
Morten Sorvig
30774e9552 Cocoa: Fix flicker on window resize.
During window resizing the geometry change events
must be processed before returning from the event
handler.

New API: QWindowSystemInterface::handleSynchronousGeometryChange,
similar to handleGeometryChange but sends the event
immediately instead of queueing it.

Change-Id: I7dc809b3fd2e8a933c100fef3f5144972f46e363
Reviewed-on: http://codereview.qt.nokia.com/2993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
2011-08-16 09:36:43 +02:00
Robert Hogan
0536ec05c3 HTTP internals: send password even if no username is set
Setting only a password (no username) for HTTP requests does not
result in the password being sent.
Only cancel authentication if neither a username nor a password is set.
Requiring a username was preventing user-less logins.

Merge-request: 1250
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Task-number: QTBUG-15566
(cherry picked from commit 6057909d2b73c2c3aa01a0e9216714ef07fb652f)

Change-Id: I23a52362e3e8cf114219accca2b548ceb9dccff7
Reviewed-on: http://codereview.qt.nokia.com/2940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
2011-08-15 21:51:37 +02:00
David Faure
168fe50106 Make QThread::sleep/msleep/usleep public.
Merge-request: 43
Reviewed-by: olivier
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

Change-Id: Ic5e3ce8f49daf83665865f89fa9fd3488cc5b349
Reviewed-on: http://codereview.qt.nokia.com/2959
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-15 15:45:52 +02:00
Olli Werwolff
7589bdc720 Disable WindowsXP/-Vista styles for now
As these styles need functionality from qregion_win
we disable them for now.

Change-Id: I0d5d38f2f684d1ee619967341849d891d17c75e6
Reviewed-on: http://codereview.qt.nokia.com/2964
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-15 14:45:26 +02:00
Olli Werwolff
24612bcb0f Fix typo in qapplication test
Change-Id: I84f1257e3483a629ea8cfca041710bdbfbd8f3ba
Reviewed-on: http://codereview.qt.nokia.com/2963
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-15 14:45:17 +02:00
Olli Werwolff
48e525efac Fixed compilation of qfiledialog_win.cpp
Change-Id: I2c84d8f55df5a35b1cc335fdb59a27f2d3d3bad6
Reviewed-on: http://codereview.qt.nokia.com/2962
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-15 14:45:02 +02:00
David Faure
3a1568c30c Add flag for non-recursive lookup of child qobject(s)
Merge-request: 40
Reviewed-by: olivier
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

Change-Id: I1194ba0d8bba92ece3132171e230cece341ec127
Reviewed-on: http://codereview.qt.nokia.com/2957
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-15 13:37:49 +02:00
Alan Alpert
c74aa53383 FocusScope's focusItem must always be a descendent
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
Change-Id: Iaaaabaabaabaabaabaaaaaffaaaeaaaaaaaacaaa
(cherry picked from commit 0ee51351894296df7328f206e444ece262692f3f)
Reviewed-on: http://codereview.qt.nokia.com/2931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-08-15 10:00:37 +02:00
Alan Alpert
7b49a23888 Don't endless loop
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
(cherry picked from commit ce36e8afa47e3625737208b5a912f9f191a59678)
Change-Id: Iaaaabadbabaaaeaaaaaaaaffaaaeaaaaaaaacaaa
Reviewed-on: http://codereview.qt.nokia.com/2757
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-08-15 10:00:37 +02:00
Alan Alpert
81b559631a Don't leak MouseEvents
Based off merge request 1312

Reviewed-by: Michael Brasser
(cherry picked from commit 206c9ba930095efb6d569f6e61a9809f16361dd5)
Change-Id: Iaaaabadbadbadaaaaaaaaaffaaaeaaaaaaaacaaa
Reviewed-on: http://codereview.qt.nokia.com/2843
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2011-08-15 08:06:25 +02:00
Rohan McGovern
bf7ca774bd test: fixed crash in tst_qmenubar::accel in qpa
Always verify that the application has an active window before
attempting to generate a key click.

This problem potentially affected all platforms, but is rare on non-qpa
Linux since QTest::qWaitForWindowShown would usually avoid the problem
on that platform.

Change-Id: I0c30be6228361faffa121c9c2d7a667f8351ebd6
Reviewed-on: http://codereview.qt.nokia.com/2896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-13 00:00:46 +02:00