summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Flag tst_QGraphicsWidget::updateFocusChainWhenChildDie test as unstable.Toby Tomkins2012-01-161-1/+2
| | | | | | | | Task-number: QTBUG-23616 Change-Id: I664c77b16ac6b2ecd89d362a2c3c3028bd3246c0 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Flag tst_qcalendarwidget::buttonClickCheck test as unstable.Toby Tomkins2012-01-161-1/+2
| | | | | | | | Task-number: QTBUG-23615 Change-Id: I4ce9e415c29167ef9fdc584ac3543aa5f109bcf2 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed failure of tst_qhostinfo since ~15 Jan 2012Rohan McGovern2012-01-161-1/+1
| | | | | | | | | | | | This test hardcodes IP address / hostname pairs to be used for forward and reverse lookups. The reverse DNS entry for 62.70.27.69 has recently disappeared. Replace it with an IP / name pair which is (hopefully) much less likely to disappear. Change-Id: I03f589e1c0f4bde0b1a14e94b3c1047eeb81246e Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove references to openvgversion.hLiang Qi2012-01-142-2/+0
| | | | | | | Because OpenVG was removed from qtbase. Change-Id: Id92ac98a6dee7679248bc3c82554e92386e7ef61 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Document Q_DECL_CONSTEXPROlivier Goffart2012-01-141-0/+11
| | | | | Change-Id: I61f4017186e8c7b943855723d7c677a01f7a7bf7 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* qmake wasn't handling spaces in names when dealing with extra installs.Kurt Korbatits2012-01-141-8/+8
| | | | | | | | | | | When installing extra binaries the paths where not being escaped, causing stripping and deleting to fail when dealing with filenames that contained one or more spaces. Change-Id: Iba4517b1110f6af30f7e2662cb86024a8b7b81f7 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up QCocoaIntegration destruction.Morten Johan Sorvig2012-01-142-9/+12
| | | | | | | | Fix memory leak - delete the font database. Remove the NAApplication delegate. Change-Id: I7c69eb4df01c8450c0abde360f77fbb318b20c83 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* qdoc3: Don't put \relates in class member functions.Martin Smith2012-01-141-15/+14
| | | | | | | | | This removes two uses of \relates that were unnecessary. Task-number: QTBUG-23599 Change-Id: I3e10375159f6535f56622f9d24e16151938c63c3 Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix qsystemerror for WinCEJanne Anttila2012-01-141-25/+33
| | | | | | | | | | | | | Windows CE does not have strerror(_r), so lets use string formatting provided by windowsErrorString function. In order to use windowsErrorString it was moved before standardLibraryErrorString function. Task-number: QTBUG-22498 Change-Id: Ifa20c4ac314ac8a26de6b0c5b67ced96b262c2b4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* remove symbian support vestiges from text codecsMark Brand2012-01-149-747/+6
| | | | | | | Change-Id: I7b577d360cb9c7225da108ee56fd927a91a04dee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fixed sqlite for Windows CE.Janne Anttila2012-01-141-13/+10
| | | | | | | | | | | | Windows CE does not declare the localtime function, for this reason sqlite3.c defines it for Windows CE. However the localtime define was too late in sqlite.c code since the osLocaltime function introduced inside ifndef SQLITE_OMIT_LOCALTIME needs it also. Task-number: QTBUG-22508 Change-Id: I97b9bc6316809178cbcf7e304c5dcd7deb9005cb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixes examples/tests to use qinptr in QTcpServer::incomingConnection.Jonas M. Gastal2012-01-1314-18/+20
| | | | | | | | This is a fix for problems introduced by bf7f170. Change-Id: If5dd8e031ef2efea578b3efb188c2e950e1ba41a Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Cleaning up header includes.Jonas M. Gastal2012-01-137-6/+7
| | | | | | | | | | QNetworkCookie doesn't need to know about QNetworkCookieJar and for QNetworkCookieJar header a forward declared QNetworkCookie is enough. Change-Id: I21145ce0f67a0a6bd68a46a5e757f82105cdf520 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Add the version header mapping for 3 new modulesLiang Qi2012-01-131-0/+3
| | | | | | | For QtWidgets, QtPrintSupport, QtPlatformSupport, they are new in qtbase. Change-Id: Ic192b9c805b4d3229f7c94a5bb620dabe455a16f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Modified changes-5.0.0 to reflect change to QTouchEvent API.Samuel Rødal2012-01-131-4/+2
| | | | | | Change-Id: I378da8d16e1b3b2ea5bd89ede0f194b49c51ae85 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* libpng config for WEC7Janne Anttila2012-01-131-1/+3
| | | | | | | | | WEC7 is missing some time conversion related functions -> configured libpng for WinCE accordingly. Task-number: QTBUG-22506 Change-Id: Ia4038aaf44944883be8f3e25817a638118c1a73d Reviewed-by: aavit <qt_aavit@ovi.com>
* Update touchscreen plug-in's readmeLaszlo Agocs2012-01-131-5/+3
| | | | | | | | To match the new mouse-for-unhandled-touch-event feature in QGuiApplication. Change-Id: Ifa3872ab51a8e95bee235a3681b0a9d1ec13081c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed QFile::link behaviour for WinCE devices.Janne Anttila2012-01-131-0/+1
| | | | | | | | | | In WEC7 both arguments given for ScCreateShortcut needs to be given in Windows format. Apparently older WinCE devices has accepted also Unix format but this is not anymore true for WEC7. The Windows format works for older WinCE versions as well. Change-Id: Ic1f394e20bae8ad42acb46929d3ff4af92daf310 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Added mkspecs for WEC7 platform builder and armv4i HW.Janne Anttila2012-01-136-0/+143
| | | | | | | Task-number: QTBUG-22496 Change-Id: I502e654de7e03fbdbd22b609698d238f90d129a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Build fix for WINCE to qlocale_tools.cppJanne Anttila2012-01-131-0/+4
| | | | | | | Task-number: QTBUG-22500 Change-Id: If530799cf8ef971f5caf78d0c6dbeeda719d148f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Windows: Fix qt_ntfs_permission_lookupMiikka Heikkinen2012-01-131-11/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Specifying qt_ntfs_permission_lookup++ in application code didn't make qfilesystemengine_win.cpp respect Windows ACL as it was supposed to. This was because GetTokenInformation for TokenUser failed always in resolveLibs() function, because the TOKEN_USER struct that was given to it wasn't large enough to contain both TOKEN_USER and SID structs that GetTokenInformation wants to return in this case. Fixed by calling GetTokenInformation twice, first to determine the required size, and then another time to get the actual token info. Additionally, the SID returned as part of the token info needs to be stored for the lifetime of the application, as the TRUSTEE_W struct has a pointer to it (currentUserTrusteeW). The worldTrusteeW initialization also required a change to properly store the SID. Note: The dynamic resolution of FreeSid and other SID manipulating functions doesn't appear to be necessary, as they are found on the same ifdef level (in winbase.h) as the GetTokenInformation, which already isn't dynamically resolved. Task-number: QTBUG-247 Change-Id: I0294c85ea903c86d03c2fcd3d801502b378dc0e5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Build fix for WINCE to qfsfileengine_win.cppJanne Anttila2012-01-131-1/+1
| | | | | | | | | | | | | | | QFileSystemEngine::currentPath() returns QFileSystemEntry, but this method expects QString return value. -> Code does not compile for WinCE Switched code to use "QFileSystemEngine::currentPath().filePath()" correspondigly as Windows desktop does if filename does not contain drive letter. This is ok, since WinCE does not support drive letters. Task-number: QTBUG-22499 Change-Id: Ic4935357c40cda30efcd2e1c7d69bf2ef7b31dd0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* add missing multiple inclusion guardMark Brand2012-01-131-0/+5
| | | | | | | Change-Id: I82e9d1ddfc1a46bf47b8948dce800dcbcc1a0305 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Constantin Makshin <cmakshin@gmail.com> Reviewed-by: hjk <qthjk@ovi.com>
* Windows: Use a message-only window as clipboard viewer or for GL.Friedemann Kleint2012-01-131-3/+3
| | | | | Change-Id: Ib8d287404b157aae2f4493ef8eba220afaba6c47 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Added application flags to translate between touch and mouse events.Samuel Rødal2012-01-1315-124/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current way we do it of having the platform or touch plugin send both mouse and touch events is not ideal. There's no good way to write an application that works sanely both on a touch-only device and on a desktop except by restricting yourself to only handling mouse events. If you try to handle touch events you don't get any events at all on desktop, and if you try to handle both, you end up getting duplicate events on touch devices. Instead, we should get rid of the code in the plugins that automatically sends mouse events translated from touch events. This change enables that by making the behaviour fully configurable in QtGui. Two new application attributes are added to explicitly say whether unhandled touch events should be sent as synthesized mouse events and vice versa, and no duplicates are automatically sent as the current situation. Synthesized mouse events are enabled by default. We also get rid of the QTouchEvent::TouchPoint::Primary flag, which was only used to signal that the windowing system automatically generated mouse events for that touch point. Now we only generate mouse events from the first touch point in the list. Change-Id: I8e20f3480407ca8c31b42de0a4d2b319e1346b65 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* QEventDispatcherWin32's internal Window should be a Message-Only WindowDebao Zhang2012-01-131-1/+6
| | | | | | | | | | | | A message-only window enables you to send and receive messages. It is not visible, has no z-order, cannot be enumerated, and does not receive broadcast messages. The window simply dispatches messages. Task-number: QTBUG-17144 Change-Id: Ibaf18f9ef5165166bf0b88e2f4952faba96d5eef Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Cocoa: Send window activation events.Morten Johan Sorvig2012-01-133-0/+22
| | | | | | Change-Id: I599b4316f1535bf4855b205bfb2117bbcee63bf0 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Remove the Q_NO_DATA_RELOCATION hackOlivier Goffart2012-01-135-67/+1
| | | | | | | | | | | | | | This hack was there because symbian used to have a problem with relocations in the data section, between libraries. Hence, this was needed so the metaobject could have a pointer to the base metaobject, despite being in another library. Anyway, I was told that symbian was fixed eventually. but the hack had to stay there because of compatibility. But now that we don't even support symbian, we can get rid of this hack totally. Change-Id: I7249971ece35d952efa92bf8b04bf3aa3667624c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improve coverage of expectfail selftestJason McDonald2012-01-135-26/+77
| | | | | | | | | Add a test case for calling QEXPECT_FAIL in a data-driven test without passing a specific data tag for the expected failure, in which the expected failure should apply to the current data row. Change-Id: I70a6592de77b1718c3a749fd2216e66f8f312805 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve coverage of expectfail selftestJason McDonald2012-01-135-26/+50
| | | | | | | | | Add a test for the case where a call to QEXPECT_FAIL nominates a different data row from the current row, in which case the call to QEXPECT_FAIL should be ignored. Change-Id: Iff774b89f9374fa26105acdd8769177272a95229 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qdoc3: Don't put a \table in a \valueMartin Smith2012-01-131-10/+19
| | | | | | | | | | | | | | | | | | | | In qdoc, the \value command is meant to document a single value of an enum. e.g. \value TypeOfService Text describing the type of service. It runs until the next \value or a blank line. Although it doesn't say you can't build a \table in the \value text, it doesn't work. For now, the fix is to remove the \table from the \value text and make the table separate from the enum \value list and let the description of the \table refer to the value that it belongs to. Task-number: QTBUG-23599 Change-Id: I88b456dca419a565eece30ba20fe09c0bcd4d98d Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc3: Don't put \relates in class member functions.Martin Smith2012-01-131-2/+0
| | | | | | | | | This removes two uses of \relates that were unnecessary. Task-number: QTBUG-23600 Change-Id: Id9bbcfa6f95d42ad552054e4839dbacb69fd1b2a Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Revert "Fixed qtmodule-configtests on Windows"Kalle Lehtonen2012-01-131-53/+35
| | | | | | | This reverts commit bb4caf3c4937418ca0e33d60cf0b25d6cfc3ea95 Change-Id: I25a9e45c9fa0953bdfe1bc112bf45341802c020d Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Improve coverage of expectfail selftest.Jason McDonald2012-01-135-23/+49
| | | | | | | | | Add a test for the case where QEXPECT_FAIL is called twice in a row without an intervening verification step, which is supposed to result in a failure. Change-Id: Ie004652a76a2c35c2679945670ff5561e8f5b62e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove shadowing members in QNetworkReplyHttpImplPrivateAlexander Færøy2012-01-121-2/+0
| | | | | | | Task-number: QTBUG-23512 Change-Id: I072dfde1741a1d32a6125f63e52cc22bc499987f Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Fix compilation of public headers with -Werror=shadowDavid Faure2012-01-122-3/+3
| | | | | Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed qtmodule-configtests on WindowsFriedemann Kleint2012-01-121-35/+53
| | | | | | | | | | | | open to "|-" and "-|" are unsupported on Windows (see `perldoc perlport'), so don't do that. Rather than parsing the output of make to decide if a config test is skipped, use a looser definition: it is skipped if qmake and make both succeed, but no binary is created. Change-Id: Idab7266888e9c934aa7b5c1c6ac5930439681107 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation of Qt itself with QT_NO_DEBUG_STREAMDavid Faure2012-01-127-15/+13
| | | | | | | Change-Id: I07087dff0f109347ea80434f17eeb7cc1c13114c Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove invokeMethod in favor of the recommended virtual_hook()Jan-Arve Saether2012-01-127-58/+11
| | | | | | | | | | We don't remove the Method enum (yet), since there are functions in dependent modules that still refer to it. Unfortunately there is no way we can commit to several repos "atomically". Change-Id: Ia1923dc4bf0751a9ba67727d14da5a2e60bd4e74 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove all references to QAccessible::(Up|Down|Left|Right)Jan-Arve Saether2012-01-128-560/+14
| | | | | | | | | | | | It is now the resonsibility of the bridge to support this (by querying for QAccessibleInterface::rect()) The windows bridge (currently the only bridge in need of this) has already been updated to reflect this in commit 7dca461620ee6d8cce3a74acf2e1530d4497bff9 Change-Id: Ief1339ab6edc118e2d47e3875e09fa885db65c2f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove QAccessibleEventFrederik Gladhorn2012-01-126-47/+0
| | | | | | | It was unused and I don't quite understand its purpose any more. Change-Id: I5c946a1644fd64508cb4aad78320ae96fd935d31 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Compile if the header files from QtWidgets are unavailableLars Knoll2012-01-124-5/+18
| | | | | Change-Id: I0a774fc1492e882bc6c02d913e6dace189fdb992 Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
* Make QFtp private.Jonas M. Gastal2012-01-1228-710/+106
| | | | | | | | | All references to QFtp in documentation have been removed, QFtp's documentaiton was marked internal. The QFtp example was removed. Task-number: QTBUG-23199 Change-Id: Ifff83cac069fb350e8ebeae63e605850e65c0c30 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add Q_COMPILER_* defines for C++11 features supported by clangBradley T. Hughes2012-01-121-1/+40
| | | | | Change-Id: I9487720c33e6ac628f7e13f80057524a950c4c5d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't crash during QApplication constructionBradley T. Hughes2012-01-121-1/+2
| | | | | | | | | | | | The QCoreApplication::init() function calls the virtual QCoreApplicationPrivate::createEventDispatcher(), which for QApplication, also creates the plaform integration. Unfortunately, the Cocoa menubar integration uses qApp before QApplication is constructed, causing a crash. Circumvent this by using QGuiApplicationPrivate directly. Change-Id: Ib36f628641761e70f9e9e39dd23e70e7537a165b Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Make QFileSystemWatcherEngines children of QFileSystemWatcherBradley T. Hughes2012-01-129-36/+33
| | | | | | | | | | To support moving QFileSystemWatcher to another thread, the engines need to follow when the watcher is moved. The easiest way to do this is by parenting the engines to the watcher. Change-Id: Ie2bb701c0c148da9cc2302d4de23286b8ef42c4d Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Do not call moveToThread(this) in QWindowsFileSystemWatcherEngineThreadBradley T. Hughes2012-01-121-1/+0
| | | | | | | | | This is considered bad practice, and gives no benefit as the threads do not use an eventloop. Change-Id: I0de9eca97948571cf5091e2f1b19bb1faab3e2ac Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add setPalette to QGuiApplicationLars Knoll2012-01-122-0/+11
| | | | | | | | If we have a getter, we also need the setter to be symmetric. Change-Id: Ibcb20d66c711e4c1bebd448781fa9eddb9cd773f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Don't include qdialog.hLars Knoll2012-01-121-1/+0
| | | | | Change-Id: I67d48653b90f31d018c77ec069eb559ac46f9275 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Made it possible to report screen changes through QWindowSystemInterface.Samuel Rødal2012-01-1213-57/+222
| | | | | | | | | | This makes it possible for platform plugin independent code (such as generic plugins) to report changes to screen properties. An example would be an accelerometer plugin that reports orientation changes without knowing anything about the windowing system. Change-Id: I984984b6d064327772c264bc942269422451da37 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>