summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into refactorLars Knoll2011-05-1217-10/+503
|\ | | | | | | | | | | | | | | Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
| * Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-112-0/+16
| | | | | | | | | | | | | | | | | | Make sure the resulting image / pixmap is valid if the source was valid. Task-number: QTBUG-19157 Reviewed-by: Kim Reviewed-by: Benjamin Poulain (cherry picked from commit 1c5da7207a21cc44a4a08d291c290ffcd9b958fd)
| * Add the QIdentityProxyModel.Stephen Kelly2011-05-113-0/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Conflicts: doc/src/frameworks-technologies/model-view-programming.qdoc tests/auto/headers/tst_headers.cpp (cherry picked from b00089261eafbdf5f92ed94d7fb20b402bfcaeb2)
| * Fix spelling mistakeShane Kearns2011-05-111-1/+1
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit b166c30d8d0834518337ded44d2ebfe097ee312f)
| * Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-111-0/+25
| | | | | | | | | | | | | | | | | | | | | | Widgets are left in a transitional (and incosistent) state while being re-parented, which caused QWidget::effectiveWinId() to crash in certain circumstances. See patch for more details. Auto test included. Reviewed-by: ogoffart (cherry picked from commit 6db0153cd7e35e4a919a76ae2aadbf2d2510bfb7)
| * Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-05-112-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | select code for open C file/socket descriptors was crashing in FD_SET if a QSocketNotifier was created with an invalid descriptor. Added two autotests to QSocketNotifier, one to check notifiers with bogus socket descriptors don't crash, the other to check that notifiers with posix socket descriptors do work. (symbian socket engine doesn't use them so they are not implicitly tested) Reviewed-by: mread Task-Number: QTBUG-18138 (cherry picked from commit 8a9a6afcf02f089f932bc81431ab46a60af32134)
| * Fix some warnings in symbian network testsShane Kearns2011-05-114-1/+9
| | | | | | | | | | | | | | | | | | | | Ignore warning when the test intentionally sets an invalid socket descriptor. Make sure to set content type on all http post tests in tst_qnetworkreply. Run test with enough capabilities to avoid platsec errors when accessing certificate store. Reviewed-By: Markus Goetz (cherry picked from commit 9632fdefa9012ca11cd1345d66bafd6f417de88e)
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-114-6/+5
| |\ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Add some QRawFont related low level functions to avoid extra copying
| | * Fix tst_QVariant::invalidColorJiang Jiang2011-05-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since a423ff5474b89028eeca95b254f5184311c8223b, the warning message is no longer produced. Reviewed-by: Samuel Rødal (cherry picked from commit 8a5e82732be3aac37d14ef85c6974add46c6b65f)
| | * Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-113-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use QTextCursor::MoveStyle enums in QTextLine because QTextCursor is not a QObject, while referring to that enum in Q_PROPERTY requires it to be. That's why we need to move the enums in Qt namespace. Reviewed-by: David Boddie (cherry picked from commit 5eba82b752e85a5d6cb3a893214ed2646d75f362)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-112-2/+2
| |\ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: tests: fixed or disabled qtbase tests with circular dependencies
| | * tests: fixed or disabled qtbase tests with circular dependenciesRohan McGovern2011-05-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | tst_lancelot did QT+=svg, but didn't actually use QtSvg. qlocalsocket/lackey uses QtScript, which is not available when compiling qtbase. Change-Id: Ic3cc5a6f74a58ee8f2fdc48b9c852d9551b85f68
* | | Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-11135-6804/+2176
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * | tests: fix private header inclusion in qtbase autotestsRohan McGovern2011-05-1162-38/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | Any test which needs private headers from some Qt module must do: QT += modulename-private Reviewed-by: Jason McDonald Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
| * | tests: disable tests in qtbase which depend on qtsvgRohan McGovern2011-05-112-2/+3
| | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: I2416d34b5c262e20ee18f7121e8745327d5614f8
| * | tests: make benchmarks compile or disable those which don't compileRohan McGovern2011-05-1113-9/+26
| | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d
| * | tests: remove references to benchmark directories which don't existRohan McGovern2011-05-111-3/+1
| | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: I14d0981c9f962c4eb048ca426a8ba19aa7ea66de
| * | tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API changeRohan McGovern2011-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | Broken by 051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4 Reviewed-by: Jason McDonald Change-Id: Ia8589aba1bfb71d000d8fad455d90e704ba28972
| * | tests: mark some tests as using private APIRohan McGovern2011-05-114-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | These autotests are all using private symbols, available only when Qt is configured with -developer-build. So, gracefully disable them when the private symbols are not available. Reviewed-by: Jason McDonald Change-Id: Iafd1c7af486feeee810110bc021e75984827f78a
| * | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-101-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the texts used for undo actions and for items in QUndoView can be set separately. This introduces an extended format of text that can be passed to QUndoCommand::setText or QUndoCommand constructor. The action text can now contain two strings separated by a "\n". The first string (that goes before "\n") is then returned by QUndoCommand::text() and used as name of item in QUndoView. The second string (that goes after "\n") is returned by QUndoCommand::actionText() and used when the text properties of the undo and redo actions are updated. If the text passed to QUndoCommand does not contain "\n", everything works as before, and both QUndoCommand::text() and QUndoCommand::actionText() return the same string. Even though action text in English usually does not need different forms for undo actions and QUndoView item, translators can employ this new command text format, for example to adjust the grammatical case used in command text to match the context of "Undo %1"/"Redo %1". Merge-request: 2610 Reviewed-by: ossi (cherry picked from commit 9b784789c75d59b27530bbf1d12676cc44f64f46)
| * | Allow using not only prefixes for undo command textAlexander Potashev2011-05-104-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action text templates "Undo %1" and "Redo %1" if no custom prefix was provided. This makes more flexible translations possible. The surrounding text (like "Undo" and "Redo") can now be suffixed to the command name as German and Korean languages require ("%1 rueckgaengig machen" for German). Also, now the default action text (when no command can be undone) can be translated differently from the prefix. For example, it can be translated as "Undo action", not just "Undo". When a non-empty prefix is passed to QUndo*****::create****Action(), those functions work as before, and the features described above become unavailable. Task-number: QTBUG-14442 Merge-request: 1212 Reviewed-by: ossi (cherry picked from commit 213c25ad24e4f3b0a44f82f23d34746cd294f8d6)
| * | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-101-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This case may be triggered in the (admittedly slightly abnormal) case where a user wishes to embed the calendar widget in a layout or, for whatever reason, do something else that will change its ownership. We work around this by detecting when it is deleted and recreating the widget. This will also have a positive side effect if setCalendarWidget() is called with a widget which is then subsequently deleted, returning the default widget instead of a pointer to (now deleted) memory. Reviewed-by: Denis Dzyubenko Merge-request: 2568 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 124ec3200f8453142717fcfe7a4aa0a55164aaa6)
| * | Make autotest more resilient against network timeoutaavit2011-05-103-6/+9
| | | | | | | | | | | | (cherry picked from commit 50be38737507f5c23b4d050e635a200024164a13)
| * | Do not filter adhoc clientsaavit2011-05-101-2/+2
| | | | | | | | | | | | (cherry picked from commit 4fe5307af44a76b99cc8c70aa330180c1985eabc)
| * | Lancelot: Add configurable client filtering to baseline serveraavit2011-05-102-10/+32
| | | | | | | | | | | | (cherry picked from commit d499f7ca995e40f7a75f913ff0f07d9a73fa3559)
| * | Improve error reporting on failure to connect to baseline serveraavit2011-05-102-1/+2
| | | | | | | | | | | | (cherry picked from commit 9d75ff6fa8f8844ff6599b68618821cd8c501757)
| * | Fix the tst_QPluginLoader::loadCorruptElf on 64 bitOlivier Goffart2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | The error message do not match Reviewed-by: Arvid Ephraim Picciani (cherry picked from commit 383f57dd2669b71fd14cf9b6b56213423a3d2d01)
| * | make QProcessEnvironment on Windows preserve variable name caseOswald Buddenhagen2011-05-101-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while windows itself does not care which case the variable names are in, they may be passed to unix tools which *do* care. note that this uses true case folding for string comparisons while windows uses uppercasing. this means that "ess" and "eß" will be considered the same by us, while not by windows. this is not expected to have real-world impact, particularly because non-ascii variable names are not used much. Task-number: QTCREATORBUG-3110 Reviewed-by: thiago Reviewed-by: dt (cherry picked from commit f3db5603871928ebed43a085a496397e65952b39)
| * | Add missing license headersJan-Arve Sæther2011-05-103-0/+123
| | | | | | | | | | | | (cherry picked from commit d5ee1bc752dc8aed717776a80e9e15972dd98065)
| * | Fix warning (unused variable) in QAccessibility test.Frederik Gladhorn2011-05-101-2/+2
| | | | | | | | | | | | | | | Reviewed-by: Morten Sorvig (cherry picked from commit c3ebd1d38826739cb989e65770d2a22b9a39dcc4)
| * | Add test for ISODate change in QDateTime::toStringJens Georg2011-05-101-0/+32
| | | | | | | | | | | | | | | | | | Merge-request: 1149 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> (cherry picked from commit d9e0c2ea4d64b8fdfb31b28e71373735be38101b)
| * | Fix BlendBench::unalignedBlendArgb32 test caseMiikka Heikkinen2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The test case freed the wrong pointer, causing crash in Symbian devices. Task-number: QTBUG-17489 Reviewed-by: Janne Koskinen (cherry picked from commit 02bb8e4c5f4584f3c0a7ed16bcba20c7f43456cd)
| * | Skip child count test on Intel compiler.Frederik Gladhorn2011-05-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason this test is sometimes giving false results with intel compilers. The child count is most likely style dependent. For now ignore it in the test. Reviewed-by: Thierry (cherry picked from commit 0ddecd383c91afb18ce2776eed5608bb1a0c2129)
| * | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-05-101-137/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier (cherry picked from commit 06e104b9c305d3db0dd1848e6e633ee3888fd1de)
| * | Added autotest for threaded text rendering.Laszlo Agocs2011-05-101-0/+41
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-18516 Reviewed-by: TRUSTME (cherry picked from commit 903d4dc2196df2775255c24c707bfeb571992bb7)
| * | Fix insert and scroll to bottom casemae2011-05-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using QtextCursor::insert() with a large text followed by setting the vertical scrollbar to its maximum value (scroll to bottom), QPlainTextEdit would not behave properly if a document size change was triggered by the insertion due to line wrapping. This was visible in Qt Creator. Auto test included. Reviewed-by: con (cherry picked from commit 5d144faf3c524ab557b88f69c4b755e20237e846)
| * | Fix tst_QTableWidget::task219380_removeLastRowGabriel de Dietrich2011-05-101-3/+2
| | | | | | | | | | | | | | | | | | | | | Again, dure to the fix to QTBUG-18551. Reviewed-by: Olivier (cherry picked from commit 1e4d824462b44315944a27ec328f7e400a67c96c)
| * | Skip linearGradientSymmetry test on QWS.Samuel Rødal2011-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | QWS defines GRADIENT_STOPTABLE_SIZE to be 256, which is not enough resolution for this test to pass. Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 0201d5f5a8c95bd4f6b94726ed0db2b83cd3efc7)
| * | Made linearGradientSymmetry test pass on qreal=float platforms.Samuel Rødal2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to loosen the requirements a bit when qreal is float... Just skip the two failing test cases for now. Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 3c659eb590aecbcdb40cb498901e757e780fa892)
| * | Benchmark for layout hierarchiesJan-Arve Sæther2011-05-103-0/+160
| | | | | | | | | | | | (cherry picked from commit cb503a3f4901c0b017374f099b0de8c0c4c50648)
| * | Manual test for layout flickeringJan-Arve Sæther2011-05-104-0/+298
| | | | | | | | | | | | (cherry picked from commit fae8bb9f583b416bf47208561c38e0b102f8578c)
| * | Added support for six-parameter radial gradients.Samuel Rødal2011-05-104-2/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | The extended radial gradients conform to the radial gradient specification in HTML 5 canvas. Task-number: QTBUG-14075 Reviewed-by: Andreas Kling (cherry picked from commit da55c1ea92474e989e5582b02815936bbf584405)
| * | Improved gradient table generation performance for two-stop gradients.Samuel Rødal2011-05-101-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Two stops is a fairly common case so we gain quite a bit by special casing it. Improves performance by 10 % in parcycle benchmark, and by 90 % in a synthetic benchmark. Reviewed-by: Andreas Kling (cherry picked from commit 5b74a70ac630073582be56f8a0539624a1080185)
| * | Fix autotest breakage in QTableWidgetPierre Rossi2011-05-101-0/+2
| | | | | | | | | | | | | | | Reviewed-by: gabi (cherry picked from commit 76a2a3278107d2713e6d999cf82db4e134c3d034)
| * | QFileSystemModel: Handle QDir::NoDot and QDir::NoDotDot for setFilterJonathan Liu2011-05-101-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for QDir::NoDot and QDir::NoDotDot for setFilter in QFileSystemModel. Task-number: QTBUG-14760 Reviewed-by: Frederik (cherry picked from commit b60d82fd56897b1a1d3cc730172f71c27a497ede)
| * | Remove Qt3ism: setToggleButton - setCheckableFrederik Gladhorn2011-05-101-8/+7
| | | | | | | | | | | | | | | Reviewed-by: Jan-Arve (cherry picked from commit d8941c0c0e3e3019a2048ae470e4e46111a2cfcf)
| * | Fix autotest.Frederik Gladhorn2011-05-101-1/+1
| | | | | | | | | | | | | | | I changed a string by accident. (cherry picked from commit 77cbbe9e47c62047ff88973d8158c42dc30fbd00)
| * | Make navigation in TabWidgets consistent.Frederik Gladhorn2011-05-101-3/+90
| | | | | | | | | | | | | | | | | | | | | | | | navigate would not return the right index in the parent if the current widget was not the visible one. Reviewed-by: Jan-Arve (cherry picked from commit fdeeaa9d61efea9cca783a1d4098ae505df24390)
| * | Fix text for checkable buttons, unit tests.Frederik Gladhorn2011-05-101-132/+158
| | | | | | | | | | | | | | | | | | | | | | | | Return Check/Uncheck for checkable buttons. Partially revive the buttons unit test. Reviewed-by: Jan-Arve (cherry picked from commit 6040eeebfb1ab3be3906295c373033cd5b5d9dc3)
| * | Window and Application fixes for accessibility.Frederik Gladhorn2011-05-101-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Return app name instead of window title for root accessibility object. Return Window as accessible type for the main window. Reviewed-by: Jan-Arve (cherry picked from commit 9a5b0d7a579572cd7e7faf869ab1a6684800f592)