| ca572c0 | Simo Fält | 29 March 2012, 10:35:50 UTC | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase | 29 March 2012, 10:35:50 UTC |
| 4451010 | Friedemann Kleint | 28 March 2012, 10:04:08 UTC | Determine font smoothing gamma in initialization. Avoid calls to QStyleHint and QPlatformIntegration from threads. Change-Id: I851ef029ea348f182e0b42536d0a994960aa9187 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 29 March 2012, 06:48:43 UTC |
| 6eae3ce | Andy Shaw | 28 March 2012, 07:56:55 UTC | The scaling should not effect the width of a cosmetic pen When the scaling effects the pen width so that it is less than 1 pixel in width then it would use the QCosmeticStroker to draw, however this should not be the case for cosmetic pens that are not less than 1 pixel in width as the scaling does not change their width. Task-number: QTBUG-25006 Change-Id: I142db0f3a7ee02aa87171495d5a7a7011100814e Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 29 March 2012, 04:22:07 UTC |
| c1e0582 | Casper van Donderen | 28 March 2012, 12:29:09 UTC | qdoc: Add simple return types such as void to output. Change-Id: I2c9b2bc982f9fa3390a7b5bd322df9e015e53824 Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 21:15:32 UTC |
| 05d1929 | Casper van Donderen | 28 March 2012, 11:59:52 UTC | qdoc: Use otherprops attribute for DITA signals/slots. Change-Id: Id85860abfb8abdf0b7bd95a65384576d8970096b Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 21:15:32 UTC |
| 3df8a12 | Harald Fernengel | 28 March 2012, 07:50:52 UTC | Compile fix for Linux Standard Base Change-Id: I1a6dba065c45bf732c0174ed0a6492cc80478985 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 28 March 2012, 19:24:43 UTC |
| 2ad8b63 | Thiago Macieira | 31 October 2011, 14:49:24 UTC | Fix warning introduced in Intel CC 12.1 Change-Id: Ie50b0bf0741637a3acfc39360804590f3c133332 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 28 March 2012, 19:24:43 UTC |
| d6d997a | Thiago Macieira | 29 December 2011, 21:28:23 UTC | Ensure that qdrawhelper.cpp is compiled with vectorisation active The GCC option -ftree-vectorize is enabled only at level -O3, so force -O3 if this is an optimised build. Also, ensure that we're using SSE for floating point math if we're in x86 (32-bit) builds. No change is necessary for the Intel compiler, since it enables vectorisation by default at any non-zero -O level. These options are not possible with MSVC. Change-Id: If1169a73cd8a3e8b34d9e21f281b78897b9aec3e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 28 March 2012, 19:24:43 UTC |
| af3c7d3 | Thiago Macieira | 27 March 2012, 17:42:43 UTC | Fix qmake's use of Q_ASSERT with side-effects. The nice side-effect of having Q_ASSERT use the condition twice is that we break code that has side-effects. Change-Id: Ia0b7ed2a8030c8e222612af95eb2d58671433110 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 28 March 2012, 19:24:43 UTC |
| 4ba9cec | Girish Ramakrishnan | 28 March 2012, 01:59:30 UTC | Remove sysroot detection configure parses the compiler from the mkspecs using an awk script. The detected compiler is then used to determine sysroot support. The awk script is currently unable to handle loading of qmake features and thus configure will not detect the compiler correctly. This is the case when using device profiles. The qdevice.pri is loaded through the qmake feature file device_config.prf. One possible way to fix this is to move this detection after qmake is built and make this a .pro based config.test. However, this cannot be done because the sysroot is actually baked into the qmake binary as the QT_SYSROOT variable. The solution is to remove this check completely and let the build fail when Qt starts compiling with --sysroot. Change-Id: I6c3b7ec2c8e5e390d6f5b1e602d656682d610b98 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 28 March 2012, 17:34:42 UTC |
| d29b56f | Girish Ramakrishnan | 28 March 2012, 03:38:00 UTC | Document configure's -sysroot option -sysroot has been undocumented so far. Change-Id: I552f9233778de9490a3479292f0cda9c8c439282 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 28 March 2012, 17:34:42 UTC |
| 68ecbff | Rafael Roquetto | 26 March 2012, 13:26:24 UTC | Remove the virtual keyword from reimpl. methods Qt Coding Standards state that "when reimplementing a virtual method, do not put the virtual keyword in the header file'". Change-Id: I89ae34eee78ad5b58a3e41845384a656225ed658 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> | 28 March 2012, 17:34:42 UTC |
| 5d117fd | Kevin Krammer | 23 March 2012, 11:50:22 UTC | Refactoring virtual keyboard class into non-singleton Getting rid of the singleton gives us better control over when the virtual keyboard handling class is instantiated and configured. Also notify screens about keyboard height changes and let them notify through QWindowSystemInterface instead of "guessing" the screen in QQnxVirtualKeyboard. Change-Id: I71a7f6b5e9d5455563404f6abe7a0daec567a12d Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> | 28 March 2012, 17:34:42 UTC |
| a80a2c6 | Kevin Krammer | 28 March 2012, 11:20:40 UTC | Move screen event processing into its own class The event handler class can then be reused when we have proper BPS event support available from corelib Change-Id: Iafe645e69248597377045c711108ce0acbe3984b Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> | 28 March 2012, 17:34:42 UTC |
| f5c5708 | Friedemann Kleint | 28 March 2012, 14:25:10 UTC | rcc: Add a note about the usage of the source code for Qt Designer. Change-Id: I672b470fcbd37b024451e7ed5f241643a1ab85a6 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 28 March 2012, 15:43:58 UTC |
| 91bdfd3 | Simjees Abraham | 28 March 2012, 13:25:53 UTC | irrelevant qDebugs from QGuiApplication removed. removed the qDebugs that are not relevant for the user and were printed when the app was started from QtCreator. Change-Id: Iae49d6c780a4d3cfd55b3e149555294e150f3f52 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 28 March 2012, 15:22:39 UTC |
| 064dc31 | Simo Fält | 28 March 2012, 14:05:48 UTC | Merge remote-tracking branch 'origin/master' | 28 March 2012, 14:05:48 UTC |
| b754deb | Martin Petersson | 27 March 2012, 08:29:57 UTC | QNam: try to read the last CRLF when chunked encoding is used. When chunked encoding is used we should try to read the last CRLF after the last zero-lenght chunk, with chunk size coded as 0. Task-number: QTBUG-19480 Task-number: QTBUG-20924 Change-Id: Ida40593fec8788bff713a31cfe6a7c2d86354a91 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> | 28 March 2012, 11:22:11 UTC |
| b2d205b | Friedemann Kleint | 28 March 2012, 08:07:34 UTC | Windows: Fix handling of -nomake. Add to list of disabled build parts (see b9a498bf514255b2a6298f44801d3d43c958044c). This fixes the tests are currently built in developer-build despite "-nomake tests". Change-Id: I43282112e03328dd89d8c874ca31b0483742ddb3 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 28 March 2012, 11:01:01 UTC |
| 9abfe70 | Friedemann Kleint | 28 March 2012, 08:07:34 UTC | Windows: Fix handling of -nomake. Add to list of disabled build parts (see b9a498bf514255b2a6298f44801d3d43c958044c). This fixes the tests are currently built in developer-build despite "-nomake tests". Change-Id: I43282112e03328dd89d8c874ca31b0483742ddb3 | 28 March 2012, 08:07:34 UTC |
| 448b9c0 | Bradley T. Hughes | 28 March 2012, 06:04:26 UTC | windowmodality test: Allow exec() with ApplicationModal dialogs Add a checkbox to the main window and dialog .ui files to allow exec()ing ApplicationModal dialogs. Change-Id: I4d8a4be136d0f6b688938a8020a6ebcc69a9dfe8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 28 March 2012, 07:42:00 UTC |
| 6c45614 | Frederik Gladhorn | 26 March 2012, 09:47:10 UTC | Add missing accessible child id. In the deprecated function the child parameter got lost. Change-Id: Ieeef19100bffaaa6079185dae6ae5bf82dcd7a60 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> | 28 March 2012, 07:42:00 UTC |
| 6d13e9f | hjk | 26 March 2012, 07:16:03 UTC | Use "qt-project.org" instead of "trolltech" in the resource system Task-number: QTBUG-23272 Change-Id: Idcdb9620910577b3c0fc9a792a0446665bd2eab6 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 28 March 2012, 05:50:06 UTC |
| 3198247 | Casper van Donderen | 27 March 2012, 09:51:42 UTC | qdoc: also allow \page index as head of ditamap. QDoc previously only supported having \page index.html as root of the ditamap, this is hard to understand. Change-Id: I9f99bf53440aad372bb72b59e7bfa1a0427cb652 Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 03:07:08 UTC |
| 89be197 | Casper van Donderen | 23 March 2012, 13:09:33 UTC | qdoc: Add CLI option to not generate example docs. Change-Id: I059ae76430adada020d338905b39ba3089c89615 Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 03:07:08 UTC |
| 419b4ab | Casper van Donderen | 23 March 2012, 13:40:07 UTC | qdoc: Rename QML classes to QML types in ditamap. Change-Id: I7b1a10d0d25a0a79fb018ab9138f2ef32470475d Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 03:07:08 UTC |
| 1f74209 | Casper van Donderen | 25 March 2012, 18:22:52 UTC | qdoc: Do not write index.dita multiple times in ditamap. Change-Id: I69719237d0ab567ce2a606c96b38f6baa2a601b5 Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 03:07:08 UTC |
| 291f436 | Casper van Donderen | 25 March 2012, 09:16:15 UTC | qdoc: Implement \uicontrol command. Change-Id: I10381cd69d32352c590ec5a7d4041465af57b88b Reviewed-by: Martin Smith <martin.smith@nokia.com> | 28 March 2012, 03:07:08 UTC |
| 32068cb | Stephen Kelly | 27 March 2012, 22:32:02 UTC | Remove comment about QVariantList and QVariantMap. They predate Qt 4.5, but it looks like the comments are indicating that QVariantList and QVariantMap types will use the basic template, but that is not the case. Instead they will use the compare specializations for QList<T> and QMap<T> respectively. Change-Id: Iebf7e9b8aaa8a699ea720090fbf641dfecde0ff7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 28 March 2012, 01:18:56 UTC |
| e5d5495 | David Faure | 20 March 2012, 17:01:20 UTC | Make QCoreApplication::applicationName() default to argv[0] This makes it more useful in all the Qt apps that don't set it, given that it's used internally by QTemporaryFile, QTemporaryDir, QStandardPaths, QDBus, QAccessibleApplication, etc. Qt4 compatibility in the deprecated QDesktopServices is preserved, no fallback there. Change-Id: I584463507cf917a3720793c6bd45d07c60f8356c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 27 March 2012, 22:51:32 UTC |
| df43b9a | Stephen Kelly | 26 March 2012, 23:54:21 UTC | Don't use the pri depends line for link dependencies. That is not what depends is for. Change-Id: Iabf93e890f009bd6c8fcc18dde1891bf20a493f1 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> | 27 March 2012, 22:51:32 UTC |
| 4a6bf9d | Stephen Kelly | 26 March 2012, 04:37:31 UTC | Prefix the variables for debug and release types properly. Change-Id: I346992effa997f60a4fd20055f0af81d6a084095 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 22:51:32 UTC |
| 878a661 | Stephen Kelly | 26 March 2012, 04:30:32 UTC | Only create the cmake files if DESTDIR is non-empty. This is the case for the winmain library. Change-Id: I8f416e81ad8de4a1fb2f70a4ebc31c8351c81605 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 22:51:32 UTC |
| 1ec383d | Stephen Kelly | 21 March 2012, 21:31:41 UTC | Remove Qt5 TODO to change QListView semantics. The comment was written before Qt5 was planned, so it might have seemed like a good idea to change the semantic with Qt 5.0. However, as Qt5 is intended to be close to Qt4 in behaviour, this isn't really a 5.0 change. It can be done any time, but only optionally and while retaining backwards compatibility. Change-Id: I8c5c497d13a7ec6574e1cdb6bd411e8b28db876b Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> | 27 March 2012, 22:51:32 UTC |
| 2744105 | Pekka Vuorela | 08 December 2011, 12:52:19 UTC | Protect QAbstractTextDocumentLayout::anchorAt() from preedit Previously the method didn't take into account that hitTest() returns visual index, i.e. containing the preedit, and thus was easily hitting assertion. Need to compensate for that before checking for actual link. Change-Id: I119e7f91088b4db9d347a3da338f6df915ce9719 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 27 March 2012, 21:03:12 UTC |
| 5e4ed93 | Thiago Macieira | 26 March 2012, 19:11:30 UTC | Stop erasing mkspecs/modules at every reconfigure. Developers who are building & rebuilding Qt often end up needing to recompile all other modules because of this removal even though the libs are still compatible. Change-Id: I4ec0e8ab222675dcd2a3f3a2b5e931c1c7f31f69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 19:14:35 UTC |
| e2dfd2f | Thiago Macieira | 25 March 2012, 23:22:18 UTC | Disable EGL (and thus EGLFS) if we're not using OpenGL ES EGL support in src/platformsupport/eglconvenience requires OpenGL ES to be enabled, so it makes no sense to test for the presence of EGL if we're not enabling OpenGL ES. EGLFS has similar requirements, so ensure it gets disabled too. Otherwise we're going to get lots of undefined symbols in the EGLFS plugin to things in QtPlatformSupport that did not get compiled in either. Change-Id: Ie55dd2e2597ec0594aa589ee8aac150c71104b46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 19:14:35 UTC |
| b0b36cc | Rafael Roquetto | 26 March 2012, 16:29:16 UTC | Fix scopes on iconv related pro/pri files Ensure corelib and the iconv configure test link against libiconv on QNX-based platforms. This now includes the Blackberry mkspecs which were previously excluded. Change-Id: I60677ab8506b7cf47f504b880bb1078036984e85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 19:14:35 UTC |
| e6a7a6a | Robin Burchell | 15 March 2012, 09:39:47 UTC | Remove xlib plugin. There's not much point having this with the xcb plugin being present, and xlib is pretty much unmaintained / broken anyway. Task-number: QTBUG-24913 Change-Id: I090a9a0e6d2f893c030574e23f1d59f610282bd3 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 27 March 2012, 17:26:45 UTC |
| 0af9217 | Uli Schlachter | 26 March 2012, 19:02:22 UTC | XCB: Simplify xcb error handling Instead of getting errors just to feed them to the default error handle, the corresponding unchecked request is used which automatically makes errors go to the default error handler. Change-Id: Ib213a860affb72de6f9896f68505e283a809d58f Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> | 27 March 2012, 17:26:45 UTC |
| aea0b24 | Bradley T. Hughes | 27 March 2012, 10:05:41 UTC | Add manual test for window modality This test allows us to recreate any modal scenario. Multiple top-level windows with any depth of window and application modal dialogs is possible. Change-Id: Ieef2c557d2f9ad2d2b2d2b598e9415f4c1e2dcb5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 27 March 2012, 17:26:45 UTC |
| 798ccb3 | Bradley T. Hughes | 26 March 2012, 12:47:12 UTC | Update documentation for QAbstractEventDispatcher::TimerInfo This type is not a typedef anymore, it's a proper class. Change-Id: I611df067f2983baf262d84a82fb98e61124956d2 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> | 27 March 2012, 17:26:45 UTC |
| c95fc3c | Qt4iOS | 24 March 2012, 14:49:52 UTC | Fix compilation when QT_NO_PRINTDIALOG is defined. Some code intended to be disabled when QT_NO_PRINTDIALOG is defined was being compiled due to misplaced #ifdef and/or #endif. Change-Id: Ic8587872fae03cac2895e54e34f8f20cb575d92b Reviewed-by: John Layt <jlayt@kde.org> | 27 March 2012, 17:26:45 UTC |
| f196332 | Marc Mutz | 23 March 2012, 11:25:33 UTC | QUuid: mark constructors constexpr See e.g. f3141c58badbd2da9eb42 for rationale. The problematic part here is the array member which in C++98 cannot be initialised in the ctor-initializer-list. For this, C++11 Uniform Initialisation is needed, for which Qt does not yet have a Q_COMPILER_* macro. I'm not sure we need one, either, since I doubt that there's a compiler that implements std::initializer_list, but not uniform initialisation. Change-Id: I4fa8f4f9db8703096358634fb2e6f5de61f0fedd Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 27 March 2012, 17:26:45 UTC |
| 59a5c78 | Laszlo Agocs | 27 March 2012, 10:44:19 UTC | Add QPA notes to QCursor pos() and setPos() Change-Id: I7173816e0d792d6d26497b4fd59a57a50e512afd Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 27 March 2012, 15:36:26 UTC |
| 854256c | Martin Petersson | 27 March 2012, 10:43:37 UTC | QHttpNetworkConnection test: avoid integer divide by zero exception. The speed calculation caused a dived by zero exception. Change-Id: I83281c8e66b9c18e7d282920901ccac1e9444a68 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> | 27 March 2012, 15:16:26 UTC |
| a4d0c56 | Orgad Shaneh | 09 December 2010, 20:20:58 UTC | Fix keyboard navigation order for buttons with RTL layout On RTL layout, right key should move to previous button, and left key should move to next button. Task-number: QTBUG-15790 Change-Id: If0753f9082b3a3624b95276840f5f3799b5e14bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 27 March 2012, 15:12:47 UTC |
| 4f1820e | Miikka Heikkinen | 23 March 2012, 12:17:23 UTC | Implement application font loading for Windows For FreeType Windows font database, use the application font loading implementation of the parent class. For native Windows font database, the implementation was adapted from Qt 4.8. Also fixed a bug in font database population, where old data was not destroyed before population, resulting in fonts not getting properly repopulated when a new font was added. Task-number: QTBUG-24193 Task-number: QTBUG-24195 Task-number: QTBUG-24196 Change-Id: Ie224a87baf7500b9867aaafa807f62dd4503dee8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 27 March 2012, 15:06:59 UTC |
| d41e056 | Jason McDonald | 26 March 2012, 17:02:13 UTC | Remove obsolete references to QWS from configure script. Task-number: QTBUG-24027 Change-Id: Id7be20aa4438e590d629ec96f5ad817866f83764 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 15:03:34 UTC |
| a861463 | Thiago Macieira | 26 March 2012, 13:31:58 UTC | Add a Q_NORETURN macro to mark a function that never returns This is implemented for GCC, ICC, Clang and MSVC. With this macro, the compiler can generate better code because it knows that the function being called will not return. Change-Id: Iea2bc7be464606639be65ccb73911d7ed1b29a64 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 14:51:30 UTC |
| 2c4845c | Friedemann Kleint | 23 March 2012, 10:44:19 UTC | Fix some compiler warnings in tests. - Unused variables - Deprecated conversion from const char * to char *. Change-Id: Iea0b9c4613ea74cead6d95ba12ad1028f531cbff Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> | 27 March 2012, 14:35:39 UTC |
| 0ee1b4a | Pekka Vuorela | 28 February 2012, 11:35:17 UTC | Reverted use of tentative commit use in QWidget editors 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> | 27 March 2012, 10:51:38 UTC |
| 4f92f9b | Friedemann Kleint | 27 March 2012, 06:30:47 UTC | Introduce FontSmoothingGamma as a platform style hint. - Allocate gamma tables on the heap in a thread-safe way, use font smoothing returned by the style hints of the platform to calculate them. - Improve font rendering on Windows. Change-Id: I8cd39b51cf03cbd642474c02b9076814baecd597 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 27 March 2012, 10:33:42 UTC |
| 8d28f26 | Jan-Arve Saether | 27 March 2012, 05:09:22 UTC | Fix IAccessible2 for Windows, enable MSAA/IAccessible for MinGW. Commit 5e9089135bfe7db7d7a43c9ee4d4c24ab8f6458d had some problems: * It left out the cast to IServiceProvider in the refactoring of QueryInterface. This broke IAccessible2. * It also failed to enable the codepath for MinGW inside wrap(), which effectively caused MSAA for MinGW to be disabled. It also adds an autotest to the bridge (finally). It is simple, but it should help avoiding committing stuff that completely breaks the bridge. Change-Id: I459d89c3bdb93e54ddea85872b50fc1dba0fe4a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 27 March 2012, 10:29:46 UTC |
| 6540a42 | Bradley T. Hughes | 21 March 2012, 09:37:20 UTC | Cocoa: silence warning about QCocoaWindow member initialization order qcocoawindow.mm:99:7: warning: field 'm_glContext' will be initialized after field 'm_inConstructor' [-Wreorder] , m_glContext(0) ^ Change-Id: I9e090ddeeaeea581b480b2e7b2b99360062c0632 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> | 27 March 2012, 10:07:52 UTC |
| 7ecbc49 | Alexei Rousskikh | 13 March 2012, 14:10:12 UTC | QJsonParseError improvements - added human-readable error message - improved enum value names Change-Id: I86d4bb419f9581f85d61b6e090048f1943017f9e Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 27 March 2012, 10:06:54 UTC |
| 4535913 | Donald Carr | 26 March 2012, 20:13:58 UTC | Configure QPA cleanup PLATFORM_QPA is always true PLATFORM_X11 is always false remove/collapse all related conditional statements to lend greater clarity to the configure script Change-Id: I4998edf5402019370333ed79effcd0cacafbe87d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 27 March 2012, 10:04:47 UTC |
| ac02d4e | Marius Storm-Olsen | 21 March 2012, 10:15:22 UTC | Remove 'tests' as default build part. This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 27 March 2012, 10:01:59 UTC |
| b72fd84 | Jason McDonald | 13 March 2012, 05:18:48 UTC | Uncomment disabled code in QSettings autotest. The code in question was already commented out before the test was added to the Qt repository in 2006. After changing the code to use QFile::rename() for portability, the test appears to pass. Change-Id: I52a8578a47da419cabf5826b633cc4f2ac2c5218 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> | 27 March 2012, 07:11:04 UTC |
| cbc883d | Thiago Macieira | 26 March 2012, 13:37:06 UTC | Disable ICC diagnostic 2261 about __assume with side-effects The warning is presented now that we use __assume in every Q_ASSERT. It presents itself in code that calls functions, like: tools/qbitarray.h(128): warning #2261: __assume expression with side effects discarded { Q_ASSERT(i >= 0 && i < size()); ^ Change-Id: I5851b3c35b56c00b9c541c2489233121ef621e04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 27 March 2012, 03:35:57 UTC |
| 84e98fd | Girish Ramakrishnan | 20 March 2012, 21:02:21 UTC | device: Add -device and -device-option to configure For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> | 27 March 2012, 03:35:57 UTC |
| 4c655be | Rohan McGovern | 26 March 2012, 23:34:48 UTC | Mark tst_qdialog as insignificant on mac. This autotest gives different results on consecutive runs, and is therefore insignificant for the purpose of detecting regressions. Task-number: QTBUG-24977 Change-Id: I5c4dfd663ce5df6b60ae47a29d332c06e3c0585f Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> | 27 March 2012, 01:36:33 UTC |
| b9a498b | Marius Storm-Olsen | 21 March 2012, 10:09:59 UTC | Sync configure with Unix version (-make/-nomake) Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 27 March 2012, 01:36:30 UTC |
| d24873c | Bradley T. Hughes | 26 March 2012, 09:58:01 UTC | Cocoa: initialize QCocoaEventDispacherPrivate::lastSerial This silences warnings from valgrind about a conditional depending on an uninitialized value. Change-Id: I819a44ed5dc02e163c00849811870c94f66b6651 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 12:57:11 UTC |
| aad02f1 | Thiago Macieira | 23 March 2012, 22:16:23 UTC | Remove old code that was for the MIPSpro compiler That compiler is no longer supported Change-Id: I6ff9003a8b986478850ad2e6e6662a44264236d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 26 March 2012, 12:51:36 UTC |
| c28e61a | Thiago Macieira | 01 March 2012, 16:44:34 UTC | Fix annoying deprecation warning about QImageTextKeyLang If we deprecate the entire class, then we get the warning for every use of it with GCC, including the three operators defined inside the class. So instead, mark as only the constructors as deprecated, which should reduce the warnings to the places where the class was instantiated. That should be enough to poison the code enough: to fix the warning, you need to stop using the class there and/or stop calling one of the deprecated functions that deal with it. Unfortunately, we still get one more warning inside the inline code, in QImage::textList. To remove that warning, we disable all deprecation warnings around that code block. Change-Id: If3c11647a9d2cab055e15810d7cfe0d8f5e7042f Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 26 March 2012, 12:45:29 UTC |
| de37821 | Bai Jing | 26 March 2012, 09:32:52 UTC | let qtPrepareTool give right path for app_bundle Change-Id: Ieb4979244d741c9d9d0c11a035c18ced87ea28f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 26 March 2012, 12:06:51 UTC |
| e1c22d4 | Rafael Roquetto | 19 March 2012, 16:30:28 UTC | Blackberry mkspecs Unlike QNX mkspecs, these mkspecs target more specific, BlackBerry-only devices. So far, the only difference is the definition of Q_OS_BLACKBERRY and linking with -lbps, but this will likely change with time. It will also allow conditional compilation to distinguish between qnx and blackberry devices. Change-Id: Ia44e9b4059f720c308240e9dac7e90f7ae7920d0 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 26 March 2012, 12:02:07 UTC |
| 1f61980 | Bradley T. Hughes | 21 March 2012, 09:30:53 UTC | Cocoa: Remove unused qt_mac_is_sheet() function The static qt_mac_is_sheet() function in qcocoafiledialoghelper.mm was not called anywhere, remove it. Change-Id: I88785e15aa17ae9c9ffbc33eba30433c8834b798 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 12:02:07 UTC |
| 155d5ec | Bradley T. Hughes | 21 March 2012, 09:29:24 UTC | Cocoa: silence warnings about unused variables Silence warnings about unused function parameters and local variables while building the Cocoa platform plugin. Change-Id: I6aedc4cb21c5fb48d2d6e501561473d3f7112aed Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 12:02:07 UTC |
| f6b25fa | Bradley T. Hughes | 20 March 2012, 12:30:10 UTC | Cocoa: silence warnings from QCocoaBackingStore Remove unused (and misspelled) flipedRect() function, as well as several unused variables. Change-Id: I48a5bf2eaad67686f60523a5c22262cad5314128 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 12:02:07 UTC |
| a9c4981 | Bradley T. Hughes | 23 March 2012, 11:53:35 UTC | Cocoa: QCocoaWindow::clearNSWindow() needs to cleanup properly clearNSWindow() should also clear the delegate and remove the contentView from the window, since we are no longer using that window. Make sure the QCocoaWindow::~QCocoaWindow() doesn't release the m_contentView until after clearNSWindow(), to avoid crashes while trying to cleanup the window and view. Change-Id: Ia081488f629a4fd4cf10fb1053fb8183b1914d35 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 09:41:07 UTC |
| d8508b8 | Donald Carr | 23 March 2012, 21:29:34 UTC | Reunite NAS support in configure with QSound RIP Change-Id: I7c47052ce4962f10dbcbbb8d48f05b3158d4a69a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 26 March 2012, 09:41:07 UTC |
| 9581e58 | Bradley T. Hughes | 21 March 2012, 08:43:45 UTC | Cocoa: don't show window when calling raise() 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> | 26 March 2012, 09:41:07 UTC |
| 8660f6e | Lars Knoll | 22 March 2012, 09:53:45 UTC | Fix measurement system for the UK THe UK still uses the Imperial system at least for distances and many other things. Change-Id: I99379de35620114328ad6a7fc9b226a46692bedd Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> | 26 March 2012, 09:41:07 UTC |
| bc0b37d | Pekka Vuorela | 16 March 2012, 12:08:13 UTC | Password editor mask delay stylable by platform plugin 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> | 26 March 2012, 09:41:07 UTC |
| 0830529 | Laszlo Agocs | 24 March 2012, 08:48:12 UTC | Test mouse events more thoroughly in QWindow autotest Apparently there are still issues here and there (e.g. in declarative) with properly recognizing more complex event sequences (like triple clicks). The behavior of qtbase is correct but we need a test case that makes sure the functionality will not regress. Change-Id: I08c558fcfdde0dd06e194b4f0affc6f6896573bf Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | 26 March 2012, 09:41:07 UTC |
| 8dac4d3 | Bradley T. Hughes | 21 March 2012, 09:49:39 UTC | Cocoa: reimplement QPlatformWindow::setOpacity() Qt and Cocoa opacity levels are compatible, so we just need to forward the setOpacity() argument to [NSWindow setAlphaValue] Change-Id: I5fd5678894fd6949811ad1c4b493e592561f01f6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 07:13:49 UTC |
| 3c3c445 | Jiang Jiang | 22 March 2012, 12:14:24 UTC | Fix for fontconfig 2.9 behavior change Start from 2.9, fontconfig will reset the result to FcResultNoMatch at the beginning of FcFontSort(). According to http://lists.freedesktop.org/archives/fontconfig/2012-March/003857.html the result value of FcFontSort() can be ignored, checking the nfont value of the fontset returned is sufficient. The fix works for pre-2.9 versions as well, since those versions don't touch the result at all. Change-Id: Iba6c1157e314088a90867292a4bd970bb873e284 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 26 March 2012, 07:12:05 UTC |
| cb33c3b | Eskil Abrahamsen Blomfeldt | 23 March 2012, 13:45:51 UTC | Remove dummy impl. of shared graphics cache in XCB plugin This implementation was disabled and didn't really work properly, so it doesn't make sense to update or do bug fixes to it. Removing it completely instead. Change-Id: I62abe35f0f9a91bb207b87296d25c3c62d58228e Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> | 26 March 2012, 07:10:56 UTC |
| eac97c5 | Bradley T. Hughes | 20 March 2012, 12:27:07 UTC | Cocoa: reimplement QPlatformBackingStore::scroll() Use qt_scrollImageInRect() from QtGui to accelerate scrolling in the Cocoa plugin. Change-Id: I8ad1377ed3307345f72d17c72049cec5472c97d3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 07:10:27 UTC |
| b2363a9 | Bradley T. Hughes | 22 March 2012, 16:43:25 UTC | Fix QGuiApplication::keyboardModifiers() Make sure that the keybaord modifiers are maintained properly when handling window system events. Change-Id: Ie75cbe5eb509c29e3d2291694f2de509fbf3098a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> | 26 March 2012, 06:47:48 UTC |
| 3701081 | Bradley T. Hughes | 22 March 2012, 16:39:30 UTC | Cocoa: send key events for modifier keys Implement -flagsChanged: in QNSView so that we can calculate the necessary modifier key events to send. Change-Id: I3de89537d6e22b4a6d69ae646a71d9722dd9f82a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 06:41:37 UTC |
| 595021e | Bradley T. Hughes | 21 March 2012, 09:38:32 UTC | Cocoa: keep a NSWindow pointer in QCocoaWindow The NSWindow we create could either be a QNSWindow (our NSWindow subclass) or a QNSPanel (our NSPanel subclass). Change-Id: I6e5c18328bf0fd1786a042d1fddc5b3e8be17f89 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> | 26 March 2012, 06:19:39 UTC |
| a760289 | Sarah Smith | 21 March 2012, 06:45:32 UTC | Fix qtnamespace compile break on Mac. Appears as though the QT_NAMESPACE macros are incorrect here. In fact in qisenum.h because the #define is no respecter of a namespace in most of these conditional compile cases they will be ignored effectively. The QT_HEADER also - if qtypetraits.h conditional compile occurs then it will result in adding extern "C" { twice. For the macros invoking them will not cause the extern "C" { to be used anyway, so just remove this altogether. Task-number: QTBUG-24903 Change-Id: I710dc330f58357f395241a0cf3172e41a5864576 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Glenn Watson <glenn.watson@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> | 26 March 2012, 03:39:37 UTC |
| 1dc7aed | Kurt Korbatits | 22 March 2012, 03:12:21 UTC | Fixed qthreadstorage unittest to work from install directory - Added install of crashonexit sub program Change-Id: I2cc3043d5c1b879665930552487b4fe54407fd25 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> | 26 March 2012, 01:42:10 UTC |
| 38f33e0 | Thiago Macieira | 29 December 2011, 21:53:30 UTC | Remove the Q_STATIC_TEMPLATE_SPECIALIZATION macro This was necessary only for older MS Visual Studio versions, which are no longer supported anyway. Change-Id: I6c96fb2340296c34b480716303c93b892419229b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> | 25 March 2012, 23:02:15 UTC |
| d3951a5 | Thiago Macieira | 11 November 2011, 19:55:46 UTC | Remove the use of a template qUnused function for ICC ICC 12 does not seem to need this. Change-Id: I98e9d530e767c4d24424f0c2b5d763f863e85fe4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> | 25 March 2012, 21:04:08 UTC |
| 1904970 | Thiago Macieira | 19 October 2011, 21:41:17 UTC | Work around what apparently is a GCC 4.6.0 bug The QFlags::operator int() isn't being called, so GCC complains that this isn't an integer expression. Change-Id: I537d06fd4a52ecbcddf0ef67807b298c42d3e911 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> | 25 March 2012, 13:09:52 UTC |
| b4ec690 | Frederik Gladhorn | 14 March 2012, 13:01:54 UTC | Improve accessibility test to handle more text events. Change-Id: I67ece6c9bb755e84c786b32e8e3396eaf634fda1 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> | 25 March 2012, 06:27:53 UTC |
| c192e64 | Thiago Macieira | 28 February 2012, 13:55:22 UTC | Use private futexes for QMutex on Linux if they're available Futexes on Linux can be used across processes, for inter-process synchronisation. The private flag tells the kernel that this futex is not used with other processes, so it does not need to check for waiters outside the current process. This feature had been proposed in Merge Request 25, but was lost. Change-Id: Ieafa8b8df0949bd9ae73709b3ec63f7709b0b2a6 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> | 25 March 2012, 04:30:16 UTC |
| efa0f1f | Samuel Rødal | 23 March 2012, 07:00:11 UTC | Use XCB_TIME_CURRENT_TIME instead of CurrentTime from X.h in xcb plugin. The less X header dependencies the better, we might at some time in the future be able to do without the XCB_USE_XLIB define as well. Change-Id: Ib45986036febef70798851ee8455e054eafc9d22 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jan Arne Petersen <jpetersen@openismus.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> | 24 March 2012, 20:07:08 UTC |
| 518a4cb | David Faure | 24 March 2012, 08:23:25 UTC | Restore Qt4 compat in QDesktopServices::DataLocation "/data/" was appended to the base directory. Change-Id: I220f2ce74c36b795bc49c7c84106feb0709d1547 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 24 March 2012, 18:07:22 UTC |
| ad81f75 | Thiago Macieira | 31 December 2011, 02:15:06 UTC | Add macros for assuming and unreachable code Use these macros to tell the compiler about conditions that may happen, so it will generate better code. But do not assume that they will do anything special. Change-Id: I89ec4f65f48a9340ccf5ffc4ae4b8c3d8897c8b1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> | 24 March 2012, 18:07:22 UTC |
| 4131c32 | Thiago Macieira | 31 December 2011, 02:14:50 UTC | Update the C++11 support macros Move them all to a central place and document each macro, so we don't give typo names by accident Change-Id: Ia863ac3f7ca82e4d2f8388b3e691a12c7e482283 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> | 24 March 2012, 18:07:22 UTC |
| 7e1aec2 | Thiago Macieira | 28 December 2011, 19:00:27 UTC | QPrinterInfo: remove a test that is too early If we want to have any chance of getting the missing printers reported, we cannot check the size beforehand. Change-Id: I450897fe53c04aeb1a4b217bd0c1f548c455a428 Reviewed-by: John Layt <jlayt@kde.org> | 24 March 2012, 16:07:52 UTC |
| e22a610 | Thiago Macieira | 16 November 2011, 16:47:11 UTC | Use QVector<int> instead of QList<int> for storing metatypes in QtDBus Change I00020eed fixed a bug present in 64-bit machines because it tried to access QList<int>'s internal array data, assuming it was a vector of ints. That worked in 32-bit, but not 64-bit. The fix involves a conversion between QList and QVector. Now fix it properly by changing everything to be QVector. The benefit is that on 64-bit, they are real vectors, not the 50%-overhead pointer array that QList is. Change-Id: I989ad279d0d8b2c9ab262a1eed413ab2365b5461 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> | 24 March 2012, 16:07:52 UTC |
| 387ec9c | Thiago Macieira | 19 October 2011, 21:42:11 UTC | Fix compilation of tst_QSqlThread: no need to use QBasicAtomicInt here Change-Id: Ib474fe62501ee1ee5e3d7008c3b561f8db79265c Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | 24 March 2012, 16:07:52 UTC |
| cea1a6b | Frederik Gladhorn | 13 March 2012, 19:25:12 UTC | Make sure windows send accessibility activated updates. Both QWindow and QWidgetWindow should update with the active state signal. Change-Id: I0219f803aa0fb109765f0faa0aedb120c2a439f0 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> | 24 March 2012, 16:07:52 UTC |
| f195a8e | Frederik Gladhorn | 13 February 2012, 13:05:51 UTC | Added QAccessibleGroupBox Added a new accessible interface for QGroupBox, as QAccessibleDisplay is not good enough when the QGroupBox is checkable. AccessibleFactory was modified to return a QAccessibleGroupBox when the accessible interface of a QGroupBox is requested. Created tst_QAccessibility::groupBoxTest Port to Qt5 of the patch by José Millán Soto <fid@gpul.org> Change-Id: I6c23dcf5562b3ea269b04102e78463b65827188a Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> (cherry picked from commit c03ceb203c65d9e3485fad848bfc0c4b6ee3e9aa) | 24 March 2012, 14:10:00 UTC |
