summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Remove insignification of QSizeGrip test on Mac OS X.Jason McDonald2012-04-242-2/+1
| | | | | | | | | The test has one stable failure. Mark it with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-23681 Change-Id: Iade17cbbd1570863bb628572d8da52ec9c0f62ba Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Skip unstable tst_QMdiArea::subWindowActivated2 test on Mac OS X.Jason McDonald2012-04-241-1/+1
| | | | | | | | | This test function recently became unstable in parallel with the change to re-enable the test. Skip the unstable function until it can be fixed. Change-Id: I0fb962aa3294a0c9b799acee52ab1fb1cd1c6924 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Remove insignification of QMdiArea test on Mac OS X.Jason McDonald2012-04-232-1/+16
| | | | | | | | | This test has only stable failures on Mac. Mark those failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-25298 Change-Id: I1c768226dfeb9307386e8853091baa68936bed29 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Implement QCocoaWindow::setWindowState.Morten Johan Sorvig2012-04-201-0/+4
| | | | | | | | | | | | | | | | | | | | Add window state change notification logic. Send and expose event in addition to window state change on window restore since the QWidget logic expects this. Modify QCocoaWindow::setVisible to sync up window state that may have been set on the hidden window. Refactor NSWindow event observing to use one observer function for all notifications. Add window state testing to tests/manual/windowflags Add delay after showFullScreen in tst_qstatusbar to wait for the Lion fullscreen transition. Change-Id: I57c523cedd0644d4181b40d72046fad4fdb09a9c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove insignification from QComboBox test on Ubuntu 11.10.Jason McDonald2012-04-201-2/+0
| | | | | | | | This test has not failed in the last 400 CI runs. Task-number: QTBUG-23639 Change-Id: I2a8e105ebcba3654a6aac4fd8207c8fbcd2c4db3 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove insignification from QMdiSubWindow test on Mac OS X.Jason McDonald2012-04-192-3/+12
| | | | | | | | | This test has four stable failures. Mark those with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-25297 Change-Id: Ic5304443c4467c46f70ef033c8f17d7f3732294c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove insignification from QMenuBar test on Ubuntu 11.10.Jason McDonald2012-04-191-2/+0
| | | | | | | | This test hasn't failed in the last 400 CI builds. Task-number: QTBUG-4965 Change-Id: I2ff03b7a12906a2b583b3127bf47c12b901ed319 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove insignification from QDoubleSpinBox test on Ubuntu 11.10.Jason McDonald2012-04-191-2/+0
| | | | | | | | This test has not failed during the last 400 CI builds. Task-number: QTBUG-23641 Change-Id: Ibcb840679e023db41456e41eedcfcc38ecedbaac Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-177-689/+4
|\ | | | | | | Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
| * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-169-40/+59
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
| * \ Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-104-51/+83
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
| * \ \ Merge master into api_changesKent Hansen2012-03-272-9/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qisenum.h src/dbus/qdbusconnection_p.h src/widgets/kernel/qwidget.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
| * \ \ \ Merge "Merge master into api_changes" into refs/staging/api_changesKent Hansen2012-03-231-4/+17
| |\ \ \ \
| | * \ \ \ Merge master into api_changesKent Hansen2012-03-231-4/+17
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
| * | | | | | Remove QWorkspace.Debao Zhang2012-03-236-685/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWorkspace had been called Q3Workspace before Qt4.0 finally released. In a sense, it is a Qt3 support Widget. And QWorkspace has been deprecated and replaced by QMdiArea at Qt4.3. Change-Id: Iea1bf831c9960c23c2b21d51fdc7c13b303642ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | | | | Cleanup Q3* itemsDebao Zhang2012-03-231-3/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup Q3* items from QtCore and QtGui modules. Change-Id: Id214a077a50e99d820c84e96e34866492a0130d8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | | | Merge master into api_changesKent Hansen2012-03-162-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/gui/kernel/qplatformsurface_qpa.cpp tests/auto/corelib/tools/qtimeline/qtimeline.pro Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-03-122-4/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/api_changes' into containtersJoão Abecasis2012-03-086-10/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qvariant.cpp src/tools/moc/moc.h Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
| * | | | | | | | Rename QMetaMethod::signature() to methodSignature()Kent Hansen2012-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt5 the meta-data format will be changed to not store the method signature string explicitly; the signature will be reconstructed on demand from the method name and parameter type information. The QMetaMethod::signature() method returns a const char pointer. Changing the return type to QByteArray can lead to silent bugs due to the implicit conversion to char *. Even though it's a source- incompatible change, it's therefore better to introduce a new function, methodSignature(), and remove the old signature(). Task-number: QTBUG-24154 Change-Id: Ib3579dedd27a3c7c8914d5f1b231947be2cf4027 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | | | | | | | | Add bug numbers to insignificant_test markers.Jason McDonald2012-04-162-2/+2
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4033ef0bd50a1be484503886b6bfda456da26675 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | | Put bug numbers on same line as insignificant_test markers.Jason McDonald2012-04-163-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to find insignificant tests that have no associated bug report. Change-Id: Ia71d59da062818d3860b0365d063e044705267fd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | | | | | | Fix tst_QMdiSubWindow::emittingOfSignals CI failuresGirish Ramakrishnan2012-04-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test fails consistently on the CI (but never fails on any of the developer machines). This is possibly a timing issue. Change-Id: Ie40d9c38c3128a93898b0e50bfde5a754bd2b7fb Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | | | | | | test: Don't mark tst_qscrollbar as insignificant on Mac OS XSergio Ahumada2012-04-132-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just XFAIL the failing test instead of ignoring the whole test. Task-number: QTBUG-25272 Change-Id: Iedca9913032f13c6610b049a0313c9e4336216e0 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | | | | | | | test: Re-enabling tst_QScrollBar::task_209492() on MacSergio Ahumada2012-04-131-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test has been XPASS'ing since a long time now. Change-Id: Ibfcd1b5078e0b8efed9ed0740a4238d24ef8ca33 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | | | | | | | Fixes a regression; missing cursor blink when input mask is set.Andreas Aardal Hanssen2012-04-121-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't say for sure why q*linecontrol passes an empty rect to the updateNeeded() signal when an input mask is set; presumably the empty rect at some point has meant "full update", but there are a few problems with this. Surely a full update is wrong, even if the semantics have been lost in translation somewhere (likely the qlinecontrol refactoring). This fix ensures that empty rects from updateNeeded() are interpreted as a request to update the whole widget. A further improvement would be to ensure the line control doesn't request a full update when an input mask is set. The cursor is usually wider when a mask is set but because of QLineEdit::paintEvent()'s implementation, there is currently a mismatch between the cursor width as seen by q*linecontrol and what is actually drawn, which causes rendering artifacts if updateNeeded() sends the cursorRect(). Since QLineEdit and Q*LineControl aren't actively developed, it's best to keep this fix minimal, although the performance cost of updating the whole line edit when an input mask is set is unfortunate. Task-number: QTBUG-7174 Change-Id: Ie51e015d760915e07b0220b770f04fc958d93a12 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* | | | | | | | Fix tst_qtextedit and remove insignification.Friedemann Kleint2012-04-112-25/+25
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The crash on XCB can no longer be reproduced. - Use QFINDTESTDATA instead of SRCDIR defines. - Remove Windows CE specific profile section. Task-number: QTBUG-20756 Change-Id: I6077b3a0daacb15ab440a90c7bda247aa3756fa5 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | | | | | | Testability for password mask delayPekka Vuorela2012-04-012-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unit test to override mask delay value so running it is not dependent on platform style hint. Change-Id: Ic5cc12d32cf97e64729b3af54250bdc05c0c95ad Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* | | | | | | Fix inputMask accessor of QLineControl.Friedemann Kleint2012-03-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not append blank character if it is the default. Task-number: QTBUG-20834 Change-Id: I17f6ac4058f295f25ff49f33c41bd9ee40b75811 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | | | | | Reverted use of tentative commit use in QWidget editorsPekka Vuorela2012-03-273-43/+65
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature to be reimplemented simplified. Cases when input method needs to be reset with possibility to commit use QInputMethod::commit() again. Change-Id: Ibfe7aecc0799e7a76c7ac4f5d860971cfe6e97ca Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* | | | | | Cocoa: don't show window when calling raise()Bradley T. Hughes2012-03-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling raise() on a hidden window should not show it. The setVisible() function will ensure that the window is raised (since we use orderFront or makeKeyAndOrderFront). This fixes the failing tst_QDockWidget::task169808_setFloating() test as well. Task-number: QTBUG-24774 Change-Id: If34472ebbcd615c10654efafd54c84c03d10bc8c Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | | | Password editor mask delay stylable by platform pluginPekka Vuorela2012-03-261-6/+4
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced hard coding as QT_GUI_PASSWORD_ECHO_DELAY with a style hint. Change-Id: I0b78ebad723dbe19d9b9496583203e31545874e2 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | | Fixed QLineEdit to emit selectionChangedPekka Vuorela2012-03-231-4/+17
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Was not emitted when removed by input method event. Change-Id: Ia2c0dcb09d42826188d4612f4c1705a41874a31d Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* | | | Cocoa: Improve basic window handling.Morten Johan Sorvig2012-03-142-3/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor NSWindow creation into createNSWindow and setNSWindow. This is necessary to support QMacNativeWidget where we re-use an already created window. Implement popup window handling. Make sure the window is displayed correctly and closes when it should. Take control over window activation in order to prevent infinite loops involving the QtCreator "cmd-k" window. Activation events are for now not sent to popup-type windows. There is now a different set of test failures: add and remove some QEXPECT_FAILs. Change-Id: I229761b59f90c9815b968eacc2cbc9c20cc5047e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | Windows: Removing insignification from QTextEdit testMiikka Heikkinen2012-03-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 660af10dee503729025952ed2374b8a081f941a2 seems to have fixed the test, so removing the insignification from it. Task-number: QTBUG-24348 Change-Id: I564e90db53d10b54e22342a1cdbef6826929c63a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Windows: Make QMenuBar autotest significant againDebao Zhang2012-03-081-2/+0
| |/ |/| | | | | | | | | | | | | | | The bug has been fix by 7bc576771de0b3c96905a6d11a75a01917334dc9 . Task-number: QTBUG-24326 Change-Id: Ifd37e9fe76cb24e49132f22909c95a55a230b1ed Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | QCursor: Associate cursor with screen.Friedemann Kleint2012-03-071-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce cursor() accessor to QPlatformScreen. - Remove screen member of QPlatformCursor (a cursor can be shared by multiple screens of a virtual desktop). - Add QCursor::pos()/ QCursor::setPos() taking a QScreen-parameter, use primaryScreen() for old overloads. QCursor::pos() can then query the platform cursor for the position and return the position even if the mouse position is outside the windows owned by the Qt application. - Fix tests Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Task-number: QTBUG-22457 Task-number: QTBUG-22565 Task-number: QTBUG-20753 Change-Id: Ia69f37343f95772e934eab1cd806bd54cbdbbe51 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fix dockwidgets behavior when window resized or central widgets is set.Debao Zhang2012-03-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding and showing a central widget in a QMainWindow then the layout does not respect the size policy of the central widget. This is a side effect of 059be19781a22d2e41f22072152589857d0fabf9 After the layout of QMainWindow is restored or the separator between central widget and dock widgets is moved by user, dock widgets should keep their size when the window if resized. Task-number: QTBUG-15689 Change-Id: Idfccb7b4ae057a99f431c2ed54e3b9fcfb6ef54c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Stabilize tst_QCalendarWidget::buttonClickCheckRohan McGovern2012-03-062-3/+2
| | | | | | | | | | | | | | | | The window should be shown and activated before sending user input. Task-number: QTBUG-23615 Change-Id: I2fc1738d9dc4ee7f03c81b040eed6389910a9d3c Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
| * \ Merge master -> api_changesRohan McGovern2012-02-2913-54/+99
| |\ \ | | |/ | | | | | | | | | | | | Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac. Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
| * | Inline and mark as deprecated images's serialNumber()Olivier Goffart2012-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These function are marked as obsolete since Qt 4.3 The motivation here was too fix QPixmap::serialNumber which is marked as QT_DEPRECATED_SINCE but was not inlined. But then I took the oportunity to do the same with all the other functions. Change-Id: Ic50a7857461fc402b2f2b4528c83e53e8e28ea30 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | QAbstractSlider - adding setRange as a slotThorbjørn Lund Martsum2012-03-021-0/+13
| |/ |/| | | | | | | | | | | | | | | | | In many situations it would be very nice to have setRange as a slot. It fits good with the rangeChanged signal - and in some situations it does make sense to synchronize scrollbars ranges. Change-Id: I6bcb41ed6e009e5822b56b621e4e187fe52502a6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | QComboBox: Use platform theme hint to determine popup geometry.Friedemann Kleint2012-02-281-12/+10
| | | | | | | | | | Change-Id: I1f81be1394455715c5dfcd2d426758c4c7cd91fc Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | Fix tst_qmenu.Debao Zhang2012-02-271-1/+0
| | | | | | | | | | | | | | | | | | Clear away Q_WS_WIN/Q_WS_X11 from QMenu. Using the hint returned by the QPlatformTheme. Task-number: QTBUG-24325 Change-Id: Iaa4da26c74273d7cfc1fbec6519c52d09e10f7bb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Skip unstable qlineedit autotest on Ubuntu 11.10.Toby Tomkins2012-02-272-0/+6
| | | | | | | | | | | | | | | | Task-number: QTBUG-24518 Change-Id: Ia271a820613c1f8a885779eddd20e261716afc6d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fix tst_qlineedit.Friedemann Kleint2012-02-242-38/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | - Fix key handling in QWidgetLineControl according to the keyboard scheme returned by the QPlatformTheme, remove #ifdefs. - Do the same in the test. Task-number: QTBUG-21402 Change-Id: I36d836584e7122309061af72819a4147cadd0a74 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | Update tst_QTextEdit::fullWidthSelectionEskil Abrahamsen Blomfeldt2012-02-237-0/+0
| | | | | | | | | | | | | | | | | | | | | | Since we would add 1 to the height of script lines in the layout before and there was no compensation for this in the box font engine, which is used by this test, the selection rect in the test images was one pixel too high. Now that the +1 has been removed from the height, the images have to be updated. Change-Id: Ic9ea0ace6b61be496846c7f757ae309756cd9f5f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | Fix conflict between QMainWindow::restoreState() and QWidget::setStylesheet()Debao Zhang2012-02-231-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QMainWindow::restoreState() then QWidget::setStylesheet() were called before the QMainWindow is shown, the size of QDockWidget can not be restored. QWidget::setStylesheet() will generate QEvent::StyleChange event, which will cause the function QDockAreaLayout::fitLayout() to be called before the layout of MainWindow is activated. Although the state info has been stored in a QMainWindowLayoutState variable by QMainWindow::restoreState(), but QMainWindowLayout::setGeometry() still isn't called at present. So QDockAreaLayout::fitLayout() will force the size of dockwidgets and centralwidget to be calculated using the wrong geometry, which will break the state restored by QMainWindow::restoreState(). This is a side effect of 692e9103ebb85b90e79377206d5d03b704d43d42. Task-number: QTBUG-15080 Change-Id: I8cda6a529d178f7467a59b780db80df0a44d4769 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | QMenuBar: Clean up Q_WS_WINDebao Zhang2012-02-231-4/+0
|/ | | | | | | | | - Replace Q_WS_WIN with Q_OS_WIN - Remove useless #ifdef Q_OS_WINCE which located in another #ifdef Q_OS_WINCE Change-Id: I6279b6d74902ab3ca6bdb7292c2936a76e3e6952 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>