summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
Commit message (Collapse)AuthorAgeFilesLines
* QWindowsBackingStore: Implement scroll.Friedemann Kleint2012-05-212-7/+0
| | | | | | | | | | Similar to XCB. Task-number: QTBUG-24299 Task-number: QTBUG-24296 (partially fixed) Change-Id: I4c9d813d9645f957f2caad0c4e395ce0d3d222cc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QIcon: move back to QtGuiOlivier Goffart2012-05-1821-2894/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the files and tests git mv src/widgets/kernel/qicon* qrc/gui/image/ git mv tests/auto/widgets/kernel/qicon/ tests/auto/gui/image/ - update the include of QIcon git grep -O"sed -i s,QtWidgets/qicon,QtGui/qicon," "QtWidgets/qicon" git grep -O"sed -i s,QtWidgets/QIcon,QtGui/QIcon," "QtWidgets/QIcon" - Adapt QIcon \ingroup documentation sed -i s/QtWidgets/QtGui/ src/gui/images/qicon* - Adapt export macro sed -i s/Q_WIDGETS_EXPORT/Q_GUI_EXPORT/g src/gui/image/qicon* - Update .pri and .pro files - Remove the use of QStyle::alignedRect by copying its content (and adapt slightly - Use QGuiApplication::palette() instead of QApplication::palette() - Add a hook in QGuiApplicationPrivate to call the QStyle::generatedIconPixmap() from QtWidgets Another commit follows to adjust QMetaType::Icon and move the QVariant and QMetaType icon handler back in QtGui Change-Id: I1b63759f892ebc02dfc30f41bb6e76e0b7451182 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix bug when destruction fields in QWizardCarl Schumann2012-05-163-1/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain the consistency of QWizardPrivate's two members: QVector<QWizardField> fields; QMap<QString, int> fieldIndexMap; during and after calls to QWizardPrivate's void _q_handleFieldObjectDestroyed(QObject *) member function. The failure to maintain this consistency caused an out of bounds access and core dump in QWizard's field(const QString &name) member function. QWizard's field(const QString &name) member function expects the values in the QMap fieldIndexMap to be indexes into the QVector fields. Prior to this change _q_handleFieldObjectDestroyed only removed the appropriate entry from the map and erased it from the vector. It did not decrement by one all the indexes greater than the index that was removed from the map and erased from the vector in the rest of the map. For example ... So if initially have the following mapping ... "field0" -> 0, "field1" -> 1, and "field2" -> 2 with fields of size 3. After destruction of "field1" have ... "field0" -> 0, and "field2" -> 2 with fields of size 2. Now attempts to look up "field2" using QWizard::field will have an out of bounds error and possibly core dump or trigger an internal Qt assert because an attempt to access this->fields[2] will be made. It should be accessing this->fields[1], but does not because the map is no longer consistent with the vector. This change adds a decrement by one for all the indexes greater than the index that was removed from the map and erased from the vector. Task-number: QTBUG-25691 Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add header qtest_widgets.h, similar to qtest_gui.h, but for QApplication.David Faure2012-05-161-1/+1
| | | | | | | | | | | | The current alternative is to define QT_WIDGETS_LIB before including qtest.h, but this is not convenient/intuitive when using other build systems than qmake. If one forgets the define, crashes happen when using QApplication-related code. Use <QTestWidgets> in one of the widgets autotests, for testing. Change-Id: Id96be4976723aea3e8a28c9d0d594daab25a6d90 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove capitalization when specifying include-libraries.kb2012-05-143-3/+3
| | | | | | | | | | | | | MinGW installations on case-sensitive filesystems expect lowercase names of include-libraries and (usually) include files. When crosscompiling on Debian 6 (targeting MS Windows) linking fails because mingw is looking for non-existent include-libraries. Using lowercase names solves this. Change-Id: Id3454f4ed8ba42b6ea93d65d9c0ce567db6712df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Improve widget geometry.Friedemann Kleint2012-05-093-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Rename posFromMove to posIncludesFrame in Widgets and make the handling more fine-grained; try to clean it up as soon as the frame margins are known in QWidgetPrivate::fixPosIncludesFrame(). - Implement QWidgetPrivate::updateFrameStrut(). - Windows: Handle posIncludesFrame in window creation, notify changed geometry after setting window flags. - XCB: Do not change the window gravity in propagateSizeHint() as this causes the window to jump around. Determine the gravity in window creation, leave it constant and fix the geometry when setting instead. - Store the normal geometry when maximize/fullscreen state change events are received. - Remove xfails from fixed tests Task-number: QTBUG-25331 Task-number: QTBUG-24905 Task-number: QTBUG-24294 Change-Id: I89c7229d86aaf88f02247d63915da7905e4a27ea Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Expose QPA API under qpa/*Girish Ramakrishnan2012-05-076-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main reasons for doing this are: 1. _qpa.h end up in the master QtGui include file. QtGui is meant for userland applications. qpa code is neither binary nor source compatible. Inadvertant use of QPA api makes the user code binary-incompatible. 2. syncqt creates forwarding headers for non-private header files. This gives people the impression that this is public API. As discussed on the mailing list, even though QPA api is internal and subject to change, it needs to treated differently from private headers since they will be used by in-qtbase and out-of-qtbase plugins. This commit does the following: 1. The _qpa in QPA header files is dropped. 2. syncqt now treats any file with qplatform prefix as a special file and moves it to qpa/ directory. The recommended way of using QPA API in plugins is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API from multiple modules (for example, qplatformfoo might be in QtPrintSupport) 3. The user needs to explicitly add QT += <module>-private to get access to the qpa api. 4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo includes. This commit does not change the cpp filenames. This requires a more careful merging of existing non qpa cpp files and existing cpp files on a case by case basis. This can be done at anytime. The following files are not renamed as part of this changed but will be fixed as part of a future change: src/gui/kernel/qgenericpluginfactory_qpa.h src/gui/kernel/qgenericplugin_qpa.h src/gui/kernel/qwindowsysteminterface_qpa.h files were renamed using for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done includes were renamed using script for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \ -e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \ -e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \ -e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \ -e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \ -e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \ $file done Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Rename setResizeMode to setSectionResizeMode.Stephen Kelly2012-05-073-12/+12
| | | | | | | | | The overload of this method was renamed in b64426248d2212eb59535b2ca383d30fdb5e1c7a but this one was not. Change-Id: I60a6ddf0fcf9deea31ccf51e7b0db16c66023356 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Load resources in in QTextDocument correctlyLars Knoll2012-05-041-3/+1
| | | | | | | | | | | | | | | In Qt 4, we loaded resources through the QTextEdit or QTextControl if they were the parent of the document. Modularization for Qt 5 broke this, as we can't cast the parent to a QTextEdit anymore. The fix is to make the loadResource() methods in QTextControl and QTextEdit invokable and discover and invoke them at runtime on the parent object. Task-number: QTBUG-25116 Change-Id: Iba04bc16849b0c5ddcd275f12d1a386a8fe591bf Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Use QFile::{encode,decode}Name to deal with QT_PLUGIN_PATHThiago Macieira2012-05-041-1/+1
| | | | | | | | | Since it deals with paths, let's use the proper path-handling functions. Change-Id: I896d2c472dfd675e9ff247657447178702f178be Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets]Thiago Macieira2012-05-0318-60/+60
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ie8ac500f2f8ebe99b7525feaa7b39247e641a461 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Don't use obsolete qVariantValue, qVariantCanConvert, etc.Debao Zhang2012-05-026-87/+87
| | | | | | | | | | qVariantValue and qVariantCanConvert are Compatibility members, while in Qt4.8 they are marked as Qt 3 Support Members. qVariantFromValue and qVariantSetValue are Obsolete members. Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove insignficiation from qgraphicsscene test on Windows.Jason McDonald2012-04-301-2/+0
| | | | | | | | | This test has been passing consistently since it started running in CI. Task-number: QTBUG-24295 Change-Id: If2a163607ae72cae9e28619dd5de1b333aea4ed9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Wrap all Latin 1 strings with QString::fromLatin1 or QLatin1StringsThiago Macieira2012-04-271-2/+2
| | | | | Change-Id: I1a1891b9126a2546c1872ec25aba9581cc84bb2f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Removed parallel_test from parallel-unsafe autotest.Rohan McGovern2012-04-271-1/+0
| | | | | | | | | This autotest passes when run alone, but sometimes fails when run concurrently with other tests. Change-Id: I327de7f4a9f8af385351e4c6b09a57311efd6eb6 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Respect the DontUseNativeDialog flag.Christoph Schleifenbaum2012-04-271-4/+1
| | | | | | | | | | | | | QFontDialog and QColorDialog were ignoring the DontUseNativeDialog. This lead to a native (Cocoa) dialog created all the time. Fix the testcase for QFontDialog. It needs the DontUseNativeDialog flag set. Task-number: QTBUG-24321 Change-Id: I159c1ad057bac38226f1e01a56b15f142650bfd8 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-261-0/+33
| | | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: Ic7053d68d8200f845c1ae330342d27af7275e057 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@digia.com> Reviewed-by: David Faure <faure@kde.org>
* Fix recursion in qwidget gdiPainting test.Friedemann Kleint2012-04-251-4/+10
| | | | | Change-Id: If4881dfecc6fc7cebcd3ed896846d34e35b3e3ae Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip tst_QInputDialog on Mac OS XBradley T. Hughes2012-04-251-0/+2
| | | | | | | | | | | This test hangs in CI, but so far I've been unable to reproduce the problem. Disable the test for now so that this test does not block changes that bring in needed functionality. Task-number: QTBUG-25496 Change-Id: I81faa574b6d7bcab2e32becc2af0f71006c7dd9c Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove insignification of QMdiArea test on Windows.Jason McDonald2012-04-242-3/+3
| | | | | | | | | This test had two stable failures, caused by including code not meant for Windows. Task-number: QTBUG-25298 Change-Id: I43d9d62ecf5a3c6eec240fafbc43a625c00f45fa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Re-enable the QMacStyle test.Jason McDonald2012-04-242-3/+3
| | | | | | | | | This test has only stable failures. Mark those failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-25296 Change-Id: I5615700ec8119a827c30e43ae651a684e78170fe Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove insignification from QDateTimeEdit test on Mac OS X.Jason McDonald2012-04-242-1/+33
| | | | | | | | | This test only has stable failures. Mark those with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-23674 Change-Id: I0e6cfe4f1992410bbc27b266f7bdafa14451aff7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* 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>
* Start running some disabled tests again on Mac OS.Jason McDonald2012-04-232-3/+1
| | | | | | | | | | | | | These tests were disabled when trying to get CI working on Mac OS because they asserted or crashed. Now that CI is working well on Mac OS, start running these tests again, initially as insignificant tests. CI results will then be used to determine whether the tests can be made significant. Change-Id: Ife411e6b8c84ade45c865ef35f3ae0071d6f8d2b Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Re-enable QGraphicsView test on Windows, Mac and Ubuntu 11.10.Jason McDonald2012-04-232-8/+5
| | | | | | | | | | | | | | | On Windows, the test had a stable failure and an XPASS related to an already closed bug report. On Mac, the test had one stable failure, on the same statement that had the XPASS on Windows. On Ubuntu, the test has been passing consistently. Mark the stable failures with QEXPECT_FAIL, remove the QEXPECT_FAIL that causes the XPASS, and remove the insignificant_test markers to re-enable the test. Task-number: QTBUG-24296 Change-Id: I05dd16b39296919268fee216332929df591f2b66 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix XPASS in QGraphicsWidget test on Ubuntu 11.10.Jason McDonald2012-04-232-2/+2
| | | | | | | | | | | This test was marked insignficiant on Ubuntu 11.10, but the only failure was an XPASS. Make the test significant again, and only include the QEXPECT_FAIL for CI platforms where the test is known to fail, i.e. Windows and Ubuntu 10.04. Task-number: QTBUG-20778 Change-Id: I24af3dab45118758382ba03c8c7a310f16301f8c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from QGraphicsProxyWidget test on Windows.Jason McDonald2012-04-232-2/+9
| | | | | | | | | This test has three stable failures on Windows. Mark those failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-24294 Change-Id: I9eee2701a228912c3a91fa730e712661fb93add6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from QCompleter autotest.Jason McDonald2012-04-231-2/+0
| | | | | | | | | Until March 15, 2012, this test failed consistently on Mac and passed on other platforms. Since then, the test has passed consistently on all platforms. Change-Id: Ie773643a1c9dc0ab3596786badbc3c3afd4824d6 Reviewed-by: Rohan McGovern <rohan.mcgovern@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>
* Ensure that this widget has focus before sending a keypress.Stephen Kelly2012-04-201-0/+2
| | | | | | | | | This doesn't fix the bug, but confirms that it is CI flakyness. Task-number: QTBUG-21098 Change-Id: Ic37a7574af88205371f4b2c24113d12b1386835c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add some more output to debug a flaky test.Stephen Kelly2012-04-201-2/+8
| | | | | | | Task-number: QTBUG-23638 Change-Id: Ib6a8634ede4b6461e41ce6843ac2654dcd1999f5 Reviewed-by: Jason McDonald <jason.mcdonald@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 Q_WS macros from qwidget-test.Friedemann Kleint2012-04-191-387/+184
| | | | | | | | | | | | | | - Remove Q_WS-ifdefed sections and switch by platform name instead. - Remove Q_OS_IRIX and Q_WS_QWS conditionals - Fix deprecated QPixmap::grabWidget(), QPixmap::grabWindow() calls. - Use QTest::qWaitForWindowShown() instead of qt_x11_wait_for_window_manager(). - Rewrite some platform-specific code using QPA interfaces. Change-Id: I29ce4c4f3e5c05edddfd018dc2eabdd77738eb23 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@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>
* Re-enable the QItemDelegate test on Ubuntu 11.10.Jason McDonald2012-04-191-2/+0
| | | | | | | | | | This test used to be unstable, but has not failed for more than 400 CI builds. Task-number: QTBUG-23637 Change-Id: I0d92136aa9d641e447820ab19b53034f475f74da Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-171-0/+13
| | | | | | | | | | | This is a regression introduced by commit 22b7d211865c1505862627a2e65bcd063e314e45. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: I3f3bfe23af802444b078a29ee5565dd2bd24a34d Reviewed-by: David Faure <faure@kde.org>
* Merge "Merge remote-tracking branch 'origin/api_changes'" into ↵Lars Knoll2012-04-1716-765/+82
|\ | | | | | | refs/staging/master
| * Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-1716-765/+82
| |\ | | | | | | | | | Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
| | * Skip tests toolbar-dialog/widget_window.Friedemann Kleint2012-04-172-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | To enable merging the api_changes branch. Task-number: QTBUG-25331 Change-Id: I90d32ca0bd96eed62bae5f01316d6360a3b435c8 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| | * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-1615-51/+65
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | QLayoutItem - make controlTypes a virtual function.Thorbjørn Lund Martsum2012-04-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just implementing the ### Qt5 suggestion about making controlTypes a virtual function. Change-Id: Ic1db47fe488f089de965438e456e9b48e0b96f32 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | Deprecate qMemCopy/qMemSet in favour of their stdlib equivilents.Robin Burchell2012-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like qMalloc/qRealloc/qFree, there is absolutely no reason to wrap these functions just to avoid an include, except to pay for it with worse runtime performance. On OS X, on byte sizes from 50 up to 1000, calling memset directly is 28-15% faster(!) than adding an additional call to qMemSet. The advantage on sizes above that is unmeasurable. For qMemCopy, the benefits are a little more modest: 16-7%. Change-Id: I98aa92bb765aea0448e3f20af42a039b369af0b3 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-109-83/+116
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | QFileSystemModel: fix sortingGiuseppe D'Angelo2012-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sorting a model recursively, the children of a QFileSystemNode are extracted from their parent in a QHash order; then filtered, then sorted (using a stable sort) depending on the sorting column. This means that the order of the children comparing to equal for the chosen sort are shown in the order they were picked from the iteration on the QHash, which isn't reliable at all. Moreover, the criteria used in QFileSystemModelSorter for sorting are too loose: when sorting by any column but the name, if the result is "equality", then the file names should be used to determine the sort order. This patch removes the stable sort in favour of a full sort, and fixes the criteria of soring inside QFileSystemModelSorter. Change-Id: Idd9aece22f2ebbe77ec40d372b43cde4c200ff38 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | | Remove WA_PaintOutsidePaintEventDebao Zhang2012-03-282-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WA_PaintOutsidePaintEvent is only suggested to be used when porting Qt3 code to Qt 4 under X11 platform. and it has been broken now. Change-Id: Ie4297b2a449f1055ca10ada9efb930e6018b1efb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | | Remove workaround for QComboBox not having a USER property.Stephen Kelly2012-03-281-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QComboBox does in fact have a user property since b1b87a73012342dc1619a8e907ea9954d59ca564. Change-Id: I24eb2ef267cec5d8a9f7348954b703fa6df04fa5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: David Faure <faure@kde.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 11:42:24 +0000