summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Move operating system detection from qglobal.h to a separate headerBradley T. Hughes2012-02-063-168/+225
| | | | | | | | | | | | | | qsystemdetection.h is included from qglobal.h, and does all Q_OS_* detection A side-effect of this change is that QT_BEGIN_HEADER and QT_END_HEADER started being defined on Mac OS X, which ends up breaking the build in some cases. Since QT_BEGIN_HEADER and QT_END_HEADER have been defined to nothing in the past, even on Mac OS X, change these 2 to be unconditionally defined to nothing. Change-Id: Ibc8a0aa2207664741c25627d7621e006c2ce80d3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows XP style: Fix warnings wrt retrieving HANDLE from 0-window.Friedemann Kleint2012-02-061-4/+5
| | | | | | | | Exclude invisible top level dialogs for whom a native dialog is being shown from top-level search. Change-Id: Ia94599905457d81d342c14d09ad0b0fc89ec4ab1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove QAccessible::FocusChild, add focusChild()Jan-Arve Saether2012-02-0614-179/+52
| | | | | | | | Also cleanup (reduce) all implementations of navigate() in order to make the final removal of navigate smoother. Change-Id: I2c216db8f5b2e40afcce8f859fc775053adc2fe3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Add accessible role Terminal.Frederik Gladhorn2012-02-061-0/+1
| | | | | | | | | | | | | | Forward ported from Qt 4. This is used to mark the role of VTs, terminal emulators. Needed in order to know about the special editing behavior. In order to make for example KDE's Konsole accessible this is required. reviewed-by: jan-arve sæther <jan-arve.saether@nokia.com> (cherry picked from commit 8ca33c6f1643ab5e89699fbf8b80bfaae108b1e5) Change-Id: Ic7beb2ae2ee70f2c526c7ec5bf982bec7ba9feda Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Use available geometry when maximized.Rafael Roquetto2012-02-061-1/+9
| | | | | | | | | | | | | Use the available geometry as a maximized window would fit on the desktop in the available area (some space is used up by task bar, system menu, etc.) as opposed to the fullscreen geometry which would be the entire screen. Change-Id: Ifa7046c5b13e162727a9b3a54178690c631cc969 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Enable basic gesture support for WEC7.Miikka Heikkinen2012-02-062-2/+2
| | | | | | | | | | | | | This commit adds basic gesture support to WEC7 Qt builds, which enables developer to create custom gesture recognizers based on mouse events. Note that QTouchEvents are not yet generated in WEC7 Qt builds, so recognizers based on those cannot be created. Task-number: QTBUG-22517 Change-Id: Ic6218500b28b78ca8edec3edebd00d84c308a182 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake: Work around MSVC compiler bug.Friedemann Kleint2012-02-051-0/+14
| | | | | | | | Disable optimization for getProjectUUID() as it triggers ASSERT: "&other != this" at qstring.h:720 with -O2. Change-Id: I51b31d4318ba9be187c186623099171d8f48235b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* reduce cost of checking cache for data() and headerData()Mark Brand2012-02-051-22/+27
| | | | | | | Assume requested row is usually not cached. Change-Id: I7727b431cc3841528aa6390400b93b1218773e65 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* QSqlTableModel::setData(): comment historical idiosyncraciesMark Brand2012-02-051-0/+14
| | | | | Change-Id: I5c4782e18dc7a471dc294a4146db04f1efd3ed2e Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* refactor QSqlTableModel::setData()Mark Brand2012-02-051-38/+20
| | | | | | | | | | | | | -move logic out of switch statement -clear cache more clearly for OnFieldChange -call setValue() in one place instead of two -eliminate extra return path Existing idiosyncracies have been kept for the time being. Change-Id: Ia4c5a5fd3e374b53e3c4d870f2ee9d37b5090917 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* refactor QSqlTableModel::setRecord()Mark Brand2012-02-051-40/+37
| | | | | | | | | | | | | | | | | | -Do not use setData() We're using ModifiedRow now so it makes sense to buffer the changes and submit the row at once. This improves readability and encourages further haromonization of the editing strategies. -No longer need temporary change to OnRowChange Previously, the strategy was temporarily changed from OnFieldChange to OnRowChange in order to obtain the desired behavior from setData(). Now, since we don't use setData(), we can program the desired behavior here and don't need this trick. -Comment historical idiosyncracies/bugs Change-Id: I6d9e2a69e1571a74c630ad1392e15b60fc0ad3f2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* merge private and public QSqlTableModel::setRecord()Mark Brand2012-02-052-33/+22
| | | | | Change-Id: I409bd32f85224db64363688d63fc372d1beaa0d3 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* ModifiedRow: use for all edit strategiesMark Brand2012-02-053-255/+139
| | | | | | | | | | | | Previously ModifiedRow was used only for OnManualSubmit and a seperate buffer and utility methods were used for OnFieldChange and OnRowChange. Also, initialization of the edit buffer is done by ModifiedRow instead of a helper function. Change-Id: I3316498e5bb10c416138ca14c3a7f8b143c8e544 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* SIC: QLocale: Make QSystemLocale a private classJohn Layt2012-02-055-109/+71
| | | | | | | | | | As discussed on list and approved by Lars and Thiago. Make QSystemLocale private to give us time and space to change it to a better implementation. Change-Id: Ifd806972f3996c43a876f544f78c6557ad71cd75 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* SIC: QLocale: Remove base argument from conversion to number apiJohn Layt2012-02-056-52/+33
| | | | | | | | | | | As discussed on list and approved by Lars and Thiago. Remove the option to use QLocale to convert strings to non-decimal numbers as they are not localised and the api is available in QString. Change-Id: Ib810505ba86fb08ad23571b39f1520e86fde6787 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: Make convert to number methods only use C localeJohn Layt2012-02-054-209/+152
| | | | | | | | Ensure consistent conversions by not using the system default locale. Change-Id: I60db9fc4f465c0254f3213419e57d7879aaddd65 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move QtConcurrent into its own moduleLars Knoll2012-02-0591-124/+204
| | | | | | | Task-number: QTBUG-20892 Change-Id: I614500aafb6428915509983608bbb0ade4e4f016 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Exclude helloconcurrent when QtConcurrent is not configuredSamuli Piippo2012-02-051-1/+2
| | | | | | | Task-number: QTBUG-23874 Change-Id: I374a08ce947e804ebb1da08c413e340e4719d9d0 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add movability tests for QByteArray.Jędrzej Nowacki2012-02-051-1/+81
| | | | | | | QByteArray is declared as movable but it was not tested before. Change-Id: I4fb636f8705c3fd792a768872206203ee5fd4ddb Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Do not crash trying to load or save QModelIndex.Jędrzej Nowacki2012-02-051-0/+2
| | | | | | | | QModelIndex doesn't have data stream operators loading or saving this type should gracefully fail. Change-Id: I6a1a3bab3f83ff4921369a07fdb54ac462eff554 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Reimplement QMetaType::destroy.Jędrzej Nowacki2012-02-051-167/+56
| | | | | | | | New implementation is using QMetaTypeSwitcher, which should reduce maintenance costs. Change-Id: Ibb7bb4b9de0e19c081c087d9eebf0c709118d3b4 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fixes QIconvCodec::convertToUnicode()Nick Ratelle2012-02-052-1/+6
| | | | | | | | | | We need to hang onto the internal state of the utf16 converter object whenever converting a long string to unicode. This was failing with the text stream class -- the first read was okay, but subsequent reads could not be correctly converted to unicode. Change-Id: I9e2d445d51c9009591bfa7a1765ea2d09ae634a2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QDateTime: Remove Julian CalendarJohn Layt2012-02-054-180/+62
| | | | | | | | | Convert QDate to only use Gregorian calendar and not Julian calendar before 1582. In future the Julian can be used via proper calendar classes. Change-Id: I547a3550332057a0ab1be616706630b6afaceffc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDateTime: Store Julian Day as qint64John Layt2012-02-055-144/+334
| | | | | | | | | | | | | | | Store the QDate Julian Day number as an qint64 instead of uint32 to enable support for dates before 2 January 4713 BCE. This changes the possible date range to be approx 2.5 Quadrillion BC to 2.5 Quadrillion AD. A qint32 was not used as it only covers 5 million BCE to 5 million CE which does include Geological or Astronomical time. The effective supported date range is currently 4800 BCE to 1.4 million CE due to restrictions in existing conversion formulas. The effective range will be extended later with new formulas. Change-Id: Ib4345369455b31d4edae8c933b7721e76414e914 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use $CFG_ARCH even if src/corelib/arch/$CFG_ARCH does not existBradley T. Hughes2012-02-041-23/+0
| | | | | | | | | | | | | Recent commits in src/corelib/arch have removed empty directories, which cause configure to assume that the architecture is not supported. This assumption is wrong, due to changes in src/corelib/thread/qbasicatomic.h to include the correct QAtomic* implementation based on compiler pre-defined macros instead of the architecture found by configure. Change-Id: I026958fb9af8af62e295e68a4643c37ac9395dc6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* MinGW: Fix warnings.Friedemann Kleint2012-02-045-8/+7
| | | | | | | | - Special #define to access HB seems no longer necessary (it was causing about mismatching DLL import attributes). Change-Id: I57cc7d57b12a67c1d549b053db81e1f198f87786 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Improve sysroot handling with regards to configure tests.Simon Hausmann2012-02-033-3/+3
| | | | | | | | | | | Some configure tests try to link programs, which when compiling against a sysroot _does_ require the --sysroot= argument in order to find crt0.o. This patch uses the existing pattern of using the export SYSROOT_FLAG in the missing linking tests. Change-Id: I063849c814f393d5f88de1b486ce9035b9f7bf65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Bring qmetaobjectbuilder in sync with mocKent Hansen2012-02-034-15/+360
| | | | | | | | | | | | | | | | | | | qmetaobjectbuilder should generate meta-objects of the same version as moc; in the future, when the moc version is bumped, QMOB has to be adapted at the same time. QMOB was generating version 4 meta-objects. This patch makes it generate version 6 (the current version). This also fixes a bug with using qt_static_metacall with QMOB (setStaticMetacallFunction()); it was already using the version 6 qt_static_metacall signature, which isn't compatible with version 4. Also add tests that ensure that the QMOB-generated meta-object works with real objects; in particular we want to test the codepaths in Qt that check for version >= 4. Change-Id: I64a151ea5c947a6f8b7a00e85a39866446c735e9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Adapt QtDBus to QVariant property type changeKent Hansen2012-02-032-3/+3
| | | | | | | | | | Commit 00c8984b4e48b2a7eadfee6c3cd0cbb19f586118 changed other parts of Qt to use QMetaType::QVariant, not 0xff, as the type for QVariant properties. QtDBus should check for that type, and also use it for QDBusVariant properties. Change-Id: I21d81b59754ae44889766877a4c5066466b46d86 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bring QtDBus meta-object generator in sync with mocKent Hansen2012-02-031-94/+54
| | | | | | | | | | | | | | | | | | | | | | QtDBus's meta-object generator should generate objects of the same version as moc; in the future, when the moc version is bumped, QtDBus's meta-object generator has to be adapted at the same time. Since QMetaObjectPrivate and related flags reside in qmetaobject_p.h, QtDBus can just include the header instead of duplicating code. qmetaobject_p.h also defines the meta-object revision QtDBus should be targeting. QtDBus was generating version 3 meta-objects. This patch makes it generate version 6 (the current version). Since a new field was added to QMetaObjectPrivate in revision 4 (signalCount), the generator had to be adapted. In particular, the signal definitions need to come before other methods (as they do with moc), since there are functions in QObject that rely on that (e.g. computeOffsets()). Change-Id: I37f102d8c1be372ef6cfaf013baa87f9abb0fd5e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation on MinGW.Friedemann Kleint2012-02-034-19/+15
| | | | | | | | | | | - Add missing constant. - Make FontKey a pair instead of a function-local type which cannot be used as template parameter for gcc. - Fix warnings about redefinition of NOMINMAX and enumeration. Change-Id: Ie3eb6e5b8dd9cd81210d6e10270ada0158aaf809 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Handle the 'real' datatype correctly in the SQLite driverAndy Shaw2012-02-033-1/+32
| | | | | | | | | | | | | | | The 'real' datatype should be seen as a QVariant::Double type and not as a QVariant::String type otherwise it does not get presented correctly when using a non Qt application to access it. Test is included for QSqlQuery. Task-number: QTBUG-16373 Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> (cherry picked from commit b23631015c23a49e3b4d296ea0a6266bfce3d4f1) Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix a typo TypeDefiniton -> TypeDefinition.Jędrzej Nowacki2012-02-033-49/+49
| | | | | | | | If you repeat a typo often enough, it becomes the right spelling. But 49 times is definitely not enough :-) Change-Id: I7c0bb29e68e4bff5c67277f9874df8b3ab8b2b54 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Include qatomic_cxx11.h for C++11 compilersBradley T. Hughes2012-02-031-1/+1
| | | | | | | qatomic_cxx0x.h doesn't exist. Change-Id: Iac654ecf09a1b890d25fa23625c8c43f2f7f1ecf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove empty src/corelib/arch subdirectoriesBradley T. Hughes2012-02-034-12/+0
| | | | | | | | | | The bfin, integrity, s390, and sh4a directories included an empty arch.pri, which is not necessary. Remove these directories and arch.pri files. Change-Id: I016dcef63e4b9fb4c14cc1fa7b9b91cba2080dbb Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/nacl/* and qatomic_nacl.hBradley T. Hughes2012-02-034-258/+0
| | | | | | | | | | This implementation uses the GCC __sync_* intrinsics, which we do not need to duplicate after commit 2bbd2262b3974fb4e39341a23e40ffdf1655ebe9 (which added qatomic_gcc.h). Change-Id: I59b6e4a03e83f58f4145a5ab2bfd635fe9ab686f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/ia64/*Bradley T. Hughes2012-02-032-78/+0
| | | | | | | | | The out-of-line q_atomic_test_and_set_(int|ptr) functions are no longer declared after commit 1955353149781a064bc053b86be6e221b159d4ee. They appear to have never been used either. Remove them. Change-Id: Ia8dfa1f585f2370091b4fd93aaf98cb10241bf31 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/i386/* and src/corelib/arch/x86_64/*Bradley T. Hughes2012-02-036-303/+2
| | | | | | | | We do not want to support out-of-line QAtomic* implementations. Remove these from the i386 and x86_64 implementations. Change-Id: Ib6a9614b7b11bf6bccc9054b177357afd83e33e6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/avr32/* and qatomic_avr32.hBradley T. Hughes2012-02-034-258/+0
| | | | | | | | | This implementation uses the GCC __sync_* intrinsics, which we do not need to duplicate after commit 2bbd2262b3974fb4e39341a23e40ffdf1655ebe9 (which added qatomic_gcc.h). Change-Id: I2cab86deacad1c37f17f0c5836d9faf2ad366495 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/mips/*Bradley T. Hughes2012-02-033-296/+0
| | | | | | | | | Commit 99fb1bea49c4de5cf3143af59f8c96a92980e58f removed the use of the old, out-of-line q_atomic_* implementation. Remove these functions from the library. Change-Id: I0b239bf779e0545cb5558862e3a40f6e95fdcbd9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/arm/*Bradley T. Hughes2012-02-032-76/+0
| | | | | | | | | After commit dc5388e79b71d796c1207681235cf007c39810bd, which removed support for non-EABI, qt_atomic_yield() and q_atomic_lock are no longer used. Remove them. Change-Id: I0f405ae63d7903c222fc2b829887207885be0a03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove #include "qatomic_macosx.h"Bradley T. Hughes2012-02-031-2/+0
| | | | | | | This file was removed in commit 68e5fd9ebc8a3f510e3144e981a0cb358945fb9c Change-Id: I76671f79432204c28ffa7488871d0eef07cc8dca Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QAbstractItemModel documentationGiuseppe D'Angelo2012-02-031-0/+1
| | | | | | | | Commit 20abd88e711a2dfcbe07925f8902faa45e5110e2 refactored the supportedDragActions methods, this oneliner adds the necessary \fn. Change-Id: I373b039138e1cbfe0f28a0aa9eb3b65245f2132d Reviewed-by: David Faure <david.faure@kdab.com>
* Add support for QNX iconv implementationRafael Roquetto2012-02-034-3/+9
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. Change-Id: I8654703e46b9c64503aca5521ce7fae1c97d7968 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove QInputContextPekka Vuorela2012-02-0316-864/+10
| | | | | | | | | | This has only been around as compatibility interface for Qt4 but is now replaced by QPlatformInputContext. Change-Id: I677dbbea46311bf39f6c5ca9dc3fb5009abe924a Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Rename qatomic_windows.h to qatomic_msvc.hBradley T. Hughes2012-02-036-76/+9
| | | | | | | | | | The QT_ARCH_WINDOWS(CE) define(s) aren't used to control which header to include anymore, so just remove it. We also do not need the empty src/corelib/arch/windows/arch.pri. Change-Id: I5400fc852af31907e533d0278540b8cd3da391cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update .gitignore to ignore qmake/qmake_pch.pchBradley T. Hughes2012-02-031-0/+1
| | | | | | | This file is generated when building qmake on Windows Change-Id: I554bb2d32cfeff6791d664a5ca7b3d605db38c77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make Clang the default makespec on Mac OS 10.7 (Lion) if Clang >= 3.0Tor Arne Vestbø2012-02-031-2/+15
| | | | | | | | | | | | Change-Id: Ibeb1db0eca2fb6d843d85c3f48c5f23a81230745 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed qsharedpointer unittest on windowsKurt Korbatits2012-02-031-1/+5
| | | | | | | - Use source file location as working directory for externaltests Change-Id: Ic05259f48eece920b348ccbde9ba80c90dedfdd2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* processEvents(WaitForMoreEvents) should return after delivering eventsBradley T. Hughes2012-02-032-11/+28
| | | | | | | | | | | | | | | | | | | | | | The Cocoa event dispatcher sends timer, socket, and posted events correctly, but they are not NSEvents, and as such, they do not cause [NSApp nextEventMatchingMask] to return. When calling processEvents() with WaitForMoreEvents, but the EventLoopExec flag isn't set, we want to interrupt the WaitForMoreEvents. As a result, We should not call wakeUp() at the top of processEvents(), otherwise we end up shortcutting other event sources. We also do not need to call QCoreApplication::sendPostedEvents() directly either in processEvents(), it's the postedEventsSource job to do that. The interruptLater mechanism is always run when calling processEvents() directly (not via exec()), which causes problems when testing processEvents(). Don't use interruptLater unless the modal sessions change (which is indicated by the cached session pointer being reset to zero). Change-Id: Iec2b49a4f306b2702c979522f12a28d0b5fbd0b4 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 11:23:12 +0000