summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove trailing whitespaceMark Brand2012-01-171-1/+1
| | | | | Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix that right aligned tabs can cause text overlappingC. Boemann2012-01-171-1/+1
| | | | | | | | | | | Eventhough there is a unittest that shows it shouldn't overlap it does at drawing. I've not been able to figure out why the unittet doesn't fail, but it has before been the case that layout and drawing don't correspond. Change-Id: I13250d0510cd0d963721b05f67ac82b1d499fbac Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix ### Qt5 for QKeySequenceLars Knoll2012-01-172-18/+10
| | | | | | Change-Id: I32e582d264991e4a42e4ca6678d477835d15dbce Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Mark obsolete methods in qregion as deprecatedLars Knoll2012-01-172-20/+21
| | | | | | | | | Make them inline as well, so they don't create symbols. Change-Id: I779103d6752e75809d16632c8c0eb374cdbd9705 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Move keyboardInput data back to QApplicationPekka Vuorela2012-01-174-25/+25
| | | | | | | | | Deprecated interface, rest of Qt now adapted to QInputPanel. Change-Id: Iacbbcac90dd7c037a24b45df1ee868f04090b21b Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Conditionally define Qt C++ "extension" macros.Erik Verbruggen2012-01-171-0/+9
| | | | | | | | | | | This patch makes it possible to disable the definition of meta-object related macros like SIGNAL, Q_SIGNALS, etc. This changes makes it possible for tools to define the macros in a way that can be used with them. Change-Id: Ie8efb1983536f57755cbc59a8f71f1d04bf080be Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add support for QWindow::setOrientation on HarmattanSimon Hausmann2012-01-175-5/+36
| | | | | | | | | | Set the _MEEGOTOUCH_ORIENTATION_ANGLE property on the window, just like Qt Components for MeeGo and MeegoTouch itself. Change-Id: I0b9adf4550593678bbcba89a2d4f1f65c1f4bd20 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Delete src/widgets/platforms/macMorten Johan Sorvig2012-01-1753-20384/+7
| | | | | | | | This looks like the mac port but isn't any more, remove it to prevent confusion. Change-Id: I498f536d77d1a3c53e687f696ca6992539a1a90b Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed crash in GL 2 paint engine on Intel Atom.Samuel Rødal2012-01-174-11/+15
| | | | | | | | | | | The GPU in question supports GL 2 but not framebuffer objects. Since we anyway have a font rendering path that doesn't use FBOs we might as well not require framebuffer objects in order to use the GL 2 engine. Task-number: QTBUG-22483 Change-Id: I2a80343fedda276e73e603ffe54edff58801af5b Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> (cherry picked from commit f13d0078d9f829cde2cd5b8b9eac40635a883ec6)
* Make tst_QGraphicsAnchorLayout1 pass on Mac OS XBradley T. Hughes2012-01-171-8/+6
| | | | | | | | | | On Mac OS X, tests are build with QT_DEBUG defined, but run against libraries built with QT_NO_DEBUG, so the expected warning output is not seen. Use a run-time check instead to know whether or not to expect the warning output. Change-Id: Ifb772b764d4135cc8f896827727939fd8cff5388 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Mark tst_QFileDialog2 failure as expected on Mac OS XBradley T. Hughes2012-01-171-0/+3
| | | | | Change-Id: I678e1c714ac9c376484b4a3a5d9bfd2bd100e685 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Join user state of removed text blocksLeandro Melo2012-01-172-9/+28
| | | | | | | | | Note: Indentation of surrounding code was fixed. Done-with: mae (cherry picked from commit 8d3d3381c127f0f4dd9fc507c3069acddbf40535) Change-Id: I8d3d3381c127f0f4dd9fc507c3069acddbf40535 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Changed qicon unittest to work from installation directoryKurt Korbatits2012-01-172-35/+5
| | | | | | | | | - Changed to use QFINDTESTDATA and TESTDATA Change-Id: Ic9fedac82d32f8484a9d915d9d91fdaabedc85e2 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Added check to qtemporaryfile unittest if run as root userKurt Korbatits2012-01-171-0/+3
| | | | | | | | | | - nonWritableCurrentDir() function not valid test if run as root so added skip. Change-Id: I772e8356e6f798f5acdf7688c55f3241ad012a43 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Added check to qtemporarydir unittest to check and skip if rootKurt Korbatits2012-01-171-0/+3
| | | | | | | | | | - nonWritableCurrentDir() function not valid test when run as root on unix platform so add skip. Change-Id: I0c5ee685d3bdeaf3d5d2e0bb93ba7d7796fd1028 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qpixmap unittest to work from installation directoryKurt Korbatits2012-01-172-23/+7
| | | | | | | | | - Changed to use QFINDTESTDATA and TESTDATA Change-Id: I962fb8093db5bd83208ebd59ec0cf82005add590 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qpainter unittest to work from installation directoryKurt Korbatits2012-01-172-10/+4
| | | | | | | | | - Changed to use QFINDTESTDATA and TESTDATA Change-Id: If75ae2b8e39f6388f4e84ed4aa2681b5a5917e81 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qicoimageformat unittest to work from installation directoryKurt Korbatits2012-01-172-9/+5
| | | | | | | | | - Changed to use QFINDTESTDATA and TESTDATA Change-Id: Icbc823d87cdf6fd36a8ef10ade8e4bca7d9b1c3b Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed qclipboard unittest to work from installation directory.Kurt Korbatits2012-01-172-9/+8
| | | | | | | | | | - made test depend on copier and paster to make sure they are built first. - Changed to use installTestHelperApp() to deploy helper apps. Change-Id: I39e4f2ddcc3c735e17256db5638bf8a3495362f6 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qimage unittest to work from installation.Kurt Korbatits2012-01-172-9/+5
| | | | | | | | | - Changed to use QFINDTESTDATA and TESTDATA Change-Id: I7aaf4d16b03373be0fef39fe05c0df0d947dc7e3 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qimagewriter unittest to work from install directory.Kurt Korbatits2012-01-172-17/+25
| | | | | | | | | | - Changed to use QFINDTESTDATA and TESTDATA - skip testing permissions if test run as root user Change-Id: I5b308789202b01bdd0d630af65775ae23bf0cc4c Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qsharedpointer unittest to use build qmake over system one.Kurt Korbatits2012-01-171-1/+12
| | | | | | | | | | - If we can find the qmake belonging to the build, use that instead of qmake from the PATH for compiling subtests. Change-Id: I9445754bb02dab11c3e1bbe9dc459ecc682689a4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Move pass/fail/skip counters from QTestResult to QTestLog.Jason McDonald2012-01-175-21/+51
| | | | | | | | | | | | | | | This change will enable further simplification of QTestResult and QTestLog in the future, including removing a circular dependency between the two classes. The "getter" functions in QTestResult are retained for now, but will be removed in a future commit, once QtQuickTest has been changed to call the getters that this commit adds to QTestLog. This commit is adapted from an unfinished change by Henrik Hartz. Change-Id: Ife7f80ac6a4310449a4712e96e0bea6c02139a5a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Clarify docs that everything must be re-queried on model reset.Stephen Kelly2012-01-162-4/+42
| | | | | Change-Id: I05970302d4f52d092a7c65a45b9e5a3570b1d144 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Accessibility plugin is for widgets.Frederik Gladhorn2012-01-161-2/+2
| | | | | Change-Id: Ifbfe1a7ec62979097ad82343b20be823579d99b9 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Remove all reimplementations of relationTo() returning Unrelated.Jan-Arve Saether2012-01-164-30/+0
| | | | | | | | QAccessibleInterface::relationTo() already return QAccessible::Unrelated by default. No need to duplicate that code. Change-Id: I40e6758b946c43ca8773cdb2d28407edf99aad49 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove Qt4 Mac accessibility backend files.Morten Johan Sorvig2012-01-165-3318/+0
| | | | | Change-Id: I2c41050b5965756ae4c2ecfe73ba5926880ed98d Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Remove a ###Lars Knoll2012-01-161-1/+1
| | | | | | Change-Id: Ibc92317b07f3746c7978e571cae105535c01e1d6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org>
* Merge the makeEncoder/Decoder overloads.Lars Knoll2012-01-162-28/+2
| | | | | | Change-Id: I9fdeeafe08dd70c0ab9ce26a2fce3b8d803ca280 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove unused variableLars Knoll2012-01-161-2/+1
| | | | | | Change-Id: Ib8725e89e40d6e12172b1da687da2e4d559444f3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix ###'es in qrect.hLars Knoll2012-01-161-37/+14
| | | | | | Change-Id: Id9635b6faeaf12ba2f7a0f70055b0df01cd16587 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix ### comments in QSetLars Knoll2012-01-161-14/+2
| | | | | | Change-Id: I302be7dc4cd7a9c2b9e35e8142ca100d6f86da7c Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Use QFunctionPointer in QOpenGLContext as well.Samuel Rødal2012-01-162-2/+2
| | | | | Change-Id: I7192e6aea721c75257bfbd1d205d5ce7764d915f Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Cleanup properly when destroying QCocoaWindowBradley T. Hughes2012-01-161-0/+2
| | | | | | | | | | [NSNotificationCenter addObserver]'s documentation clearly states that removeObserver needs to be called before releasing the object being observed. The m_contentView we create was never released either, so be sure to release that as well. Change-Id: Ia54eb1c5c751f4cb0edb21ad559b261cb8f24208 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed QGLContext::getProcAddress() to return a function pointer.Samuel Rødal2012-01-164-8/+6
| | | | | | Task-number: QTBUG-5729 Change-Id: I57e71f89a2c5ca7f74f73c66adcbf4a6cc073813 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fixed build break when bearer is disabled.Xizhi Zhu2012-01-1611-4/+47
| | | | | Change-Id: I29e88b046f6502c84acc9c6f566ecc328cf24e38 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* xcb: Obey maximum request length when uploading imagesUli Schlachter2012-01-161-11/+41
| | | | | | | | | | | | | | | | | | | | | When connecting to an X11 server, the server tells the client what its maximum allowed request size is. Larger requests are not permitted. Thus, libxcb verifies that all requests which are sent are smaller than this size limit and possibly kills the connection (without any good error message). Thus, when uploading an image, we could be trying to send more pixel data than fit into a single request. If this would be the case, the code will now use multiple requests where each request only sends a part of the allowed rows. In case all the data fits into a single request, this commit shouldn't change any behavior. Change-Id: I84a4ebfcdb6de7e206015c37e3e33cba3bd309b1 Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Clean up and extend QAccessible::State.Frederik Gladhorn2012-01-168-48/+99
| | | | | | | | | | | | | | | | | | | | | | The state should contain useful and clear information. Some of the old enum/bitfield members were not really clear. Make them follow Qt terminology and shift the burden of interpreting them to the bridge. Apart from the previous commit changing from enum to bitfield, these flags have changed names: unavailable -> disabled mixed -> checkStateMixed protected -> passwordEdit (in the last commit) floating is completely removed, even MSAA documentation states it is unsupported. Some new states have been added. Documentation added. Change-Id: I152256e77a061f28ee5780f527524c80a2c7e333 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Flag tst_qmenubar tests as unstable.Toby Tomkins2012-01-161-0/+3
| | | | | | | | Task-number: QTBUG-4965 Task-number: QTBUG-11823 Change-Id: Ie8b5093867cf177197e405fdcf3205d4436c110a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Flag tst_QDoubleSpinBox::task255471_decimalsValidation test as unstable.Toby Tomkins2012-01-161-0/+3
| | | | | | | Task-number: QTBUG-23641 Change-Id: Iaa44ab20d2e50cd6fb0a1327efef35c1036f9e4c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Flag tst_QComboBox tests as unstable.Toby Tomkins2012-01-161-0/+3
| | | | | | | | | | tst_QComboBox::keyBoardNavigationWithMouse and task_QTBUG_1071_changingFocusEmitsActivated tests are unstable. Task-number: QTBUG-23639 Change-Id: Ib8363505213117c581ea2921ebc58d4c2ec4cf8c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Accessible docs - editable text interface.Frederik Gladhorn2012-01-161-2/+66
| | | | | Change-Id: Id8b64ff9674b7cd4ac8551528239e8ab97563764 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* xcb: abort (rather than segfault) when X is not availableRohan McGovern2012-01-161-13/+16
| | | | | | | | Be more user-friendly (e.g. when logging into a machine by ssh and forgetting to export DISPLAY). Change-Id: I9d07b0af9c5b4841827826053bb27b507801ae61 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Flag tst_QTreeView::styleOptionViewItem test as unstable.Toby Tomkins2012-01-161-0/+3
| | | | | | | Task-number: QTBUG-23638 Change-Id: I8c07976001aeec5ba796d4b3e9ee421e32ba1360 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Flag tst_QItemDelegate::task257859_finalizeEdit test as unstable.Toby Tomkins2012-01-161-0/+2
| | | | | | | Task-number: QTBUG-23637 Change-Id: Ib08431ab1752c354f62646b3c207d9c24ac5eae5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Modify SSL Socket test exceptions on Ubuntu 11.10 x64.Toby Tomkins2012-01-161-20/+5
| | | | | | | | | | | Modified exceptions as most tests are now passing correctly. Three exceptions still remain, two serverSideMode tests (ssl3-any, tls1.0-any) and a verifyMode test. Task-number: QTBUG-23575 Change-Id: I847e8c2e3484050b8d07ede9aec955c30f7ef5a1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qglobal: Remove symbian specific featuresOlivier Goffart2012-01-162-496/+15
| | | | | Change-Id: Ie0480b0c80b68a86e77bf3552546f494cdaf66c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Improve the documentation of QStringLiteralOlivier Goffart2012-01-161-3/+27
| | | | | | Change-Id: I4bbe18ecc342f034fbc8e9fd14b700ee5272076f Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Remove unused QTestResult::allDataPassed().Jason McDonald2012-01-162-6/+0
| | | | | | | The removed function was private API and was not used anywhere in Qt. Change-Id: Ia262d119ebba30f6968cb7145043475bf88ffa39 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Rename QTestLog::addIgnoreMessage to QTestLog::ignoreMessage.Jason McDonald2012-01-163-3/+4
| | | | | Change-Id: I4cfcd00d444d0812c58afab6ffd43dee37db1340 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>