summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Document how to name threads.Mitch Curtis2012-11-281-0/+8
| | | | | Change-Id: Ia79f5dd4a55d5260032781eab2f74737d65729f2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixes problem with single precision floats in QDataStream (Windows).Christian Strømme2012-11-282-1/+49
| | | | | | | | | | | | | | When the floating-point behavior in MSVC is set to "precise" (default), assigning nan numbers to a float causes the bit pattern to be altered (only affects 32bit builds). We should therefore not assign the swapped value back to a float and use it. Backported from Qt 5 (3f936e9094f3a6e4d76791c1eff7ae92f91b61ae) Task-number: QTBUG-25950 Change-Id: I39725557ab89c978eb1c59a4c79df8a27ed70ecf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Make textEditTest more tolerant wrt characterRect verificationJan Arve Saether2012-11-282-8/+68
| | | | | | | | | | | | | | | | Should become more stable due to two changes: 1. When QAccessibleTextWidget::characterRect() calculates the height, make sure the leading is not included. 2. Accept a small error (1) on height and width. It there is an error on the height or width, dump diagnostics This makes it pass with all Latin fonts on my system (roughly ~150 fonts), where it didn't before. Change-Id: I964207bad1f3ceb0103129501bdc857aff5885d2 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* BlackBerry: Fixed physical screen dimensions when rotatedBernd Weimer2012-11-281-2/+6
| | | | | | | | | | | | | libscreen will always provide the same physical screen dimensions regardless of the initial orientation. Width and hight will now be swapped appropriately (to make sure that the DPI value is correct). The Qt5 implementation is different (the qnx plugin takes the initial orientation into account). Change-Id: I983d1db7ae334b442597b62dde64d41bb991690c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* BlackBerry: Restore proper BPS channel in event dispatcherBernd Weimer2012-11-281-8/+36
| | | | | | | | | | | | This change ensures that BPS events are delivered to the proper channel even if the application code would change the channel. Backport from qtbase: 131b86347384a97a7044942acd723c4ef5669636 Change-Id: Ib2bdd3d973bc51f5ce85eb6ef9adcb3e57093a54 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Device mkspec for Blackberry PlaybookRafael Roquetto2012-11-284-0/+98
| | | | | | | | | This defines Q_OS_BLACKBERRY_TABLET. This define is not necessary on Qt5. Change-Id: I2e2553f3b33d896df9e219c12e738251eed8a231 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Draw disabled QMenu items in inactive state in vista style.Friedemann Kleint2012-11-281-1/+1
| | | | | | | | Task-number: QTBUG-27992 Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5223e7eb27dc15f8428aeb66dd8c57098dedce58)
* BlackBerry mkspecs: use compiler flags for C++ and C compilerPeter Hartmann2012-11-282-0/+5
| | | | | | | | | | | | | ... and not only for the C compiler. Apparently the logic has changed between Qt 4 and Qt 5. This commit is not needed for Qt 5, because there we set the CXXFLAGS after parsing the BlackBerry mkspec file. Change-Id: I225d636586d19fa0e2b0d5a644071202774a385c Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed crash in tst_qglthreads.Samuel Rødal2012-11-281-1/+2
| | | | | | | | | | | | | | | QGLTextureCache has a read write locker to protect texture lookups. However, even calling QCache::object() might modify the cache, causing race conditions, since it modifies the priority order of the objects in the cache. Therefore, we need to protect it with a QWriteLocker instead of a QReadLocker. Task-number: QTBUG-22560 Change-Id: I46fffc624ace27e25fb100f865e1df0a19b9093d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> (cherry picked from commit 6633dbbac49f4ce8a89b67090fdffaa8c8126eb5) Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Do not detect directories ending in ".lnk" as link files.Friedemann Kleint2012-11-282-1/+13
| | | | | | | | Task-number: QTBUG-21863 Change-Id: I70b661fa5fcaba1293a80c971c506798826f5b23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/1022c3ce9d445fd482a62309b9a6c52495c04a92)
* qmake: do not exclusively lock files for reading on Windows/MSVCJoerg Bornemann2012-11-281-1/+1
| | | | | | | | | | | | | When sifting through a file to find Q_OBJECT and friends, qmake was locking it for reading and writing (_SH_DENYRW). This breaks parallel builds where multiple qmake instances might want to scan the same file. Changed the sharing constant to _SH_DENYNO, which doesn't lock the file at all. This is consistent with the _sopen_s call in findDeps. Change-Id: I9c0a06db7f580f411e79d9d96dd36a6d705679aa (cherry picked from commit 9cd7eb29f3b216bdac215fb7633b4b51d534d220) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix multiple tablet hires coordinate bug under X11Ryan Stelzleni2012-11-281-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | On X11 if you have multiple tablet input devices, like a Wacom Cintiq and a Wacom Intuos tablet connected at the same time, one of the tablets will generate incorrect high resolution coordinates. The reason seems to be that when translating the XEvent in qapplication_X11.cpp the code searches for the first tablet device it finds that supports the type of the current event. Since both tablets will support this event type, we wind up always finding only one of the tablets. Specifically, the first tablet that was found when enumerating tablets during qt_init. Then all calls to QTabletDeviceData::scaleCoord are made on the same device, so the size of one of the devices is never used. That device will wind up with incorrect high resolution coordinates. When not running under IRIX the XEvent will have a deviceid which we can use to find the correct device to use for scaling. This change implements that fix. Change-Id: I667a52a729273a9b12880592d0a4cd7ce7f16106 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Remove insignificant_test from tst_QXmlQuerySergio Ahumada2012-11-261-2/+0
| | | | | | | | | The test is now passing on all CI platforms. Change-Id: I205d8d6951c64f5eca3b2f7ea4d6c362ab046fda Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark some tst_QHostInfo functions as XFAILSergio Ahumada2012-11-261-0/+14
| | | | | | | | | tst_QHostInfo::cache() tst_QHostInfo::abortHostLookup() Task-number: QTBUG-28079 Change-Id: I6f524cdee86bc77583852327e18c6d4a79595323 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* BlackBerry: Changed QSettings file accessBernd Weimer2012-11-263-6/+88
| | | | | | | | | | | | | | On the BlackBerry platform, applications run in a sandbox. They are not allowed to read or write outside of this sandbox. Hence in QSettings there is no use for the system scope and differentiating between organization and application. This change will also improve performance. Backport from qtbase: 146f63bea487dbc4d6af34b56fa382f5a6a18e82 Change-Id: I0000d6910b56cdb75728422e1889cd5f0c646eb3 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* BlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)Peter Hartmann2012-11-251-0/+2
| | | | | | | | | | | ... so the compiler knows which instructions to generate and can optimize for the specific CPU. All BlackBerry platforms are Cortex-A9 compatible. (cherry picked from commit 44b1c5dde2dfbb69a29cbd4ad8d1f0ac0203b482) Change-Id: I730dea78421d4688e0afa60f8f095f3166e5b733 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix moc from choking on boost headers.Kevin Kofler2012-11-251-0/+4
| | | | | | | | | Fixes several build failures with boost >= 1.48, for example the kdepim build: https://bugs.kde.org/show_bug.cgi?id=304111 Task-number: QTBUG-22829 Change-Id: Ic37a5290955fbfd18894a228cc9d57615edddea6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix hover handling in QTreeViewMiikka Heikkinen2012-11-242-14/+12
| | | | | | | | | | | | | | | Cached hoverBranch could get invalid if branches were collapsed or expanded programmatically, leading to a crash in some situations. Fixed the logic for updating hovered over branch indicators and also now update hoverBranch when drawing so that it is guaranteed to be up to date there - this fixes issues like hover indicator not updating when the view is programmatically scrolled. Task-number: QTBUG-27158 Change-Id: I5bd1ad76aee512ad78df33959a84ead16886a47c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qt5/qtbase commit fd6a870136ab2fdb3ce8b516abcf8c05d45caba7))
* test: Mark some tst_qdeclarativetextedit functions as XFAILSergio Ahumada2012-11-231-4/+24
| | | | | | | | | | | | tst_qdeclarativetextedit::cursorDelegate() tst_qdeclarativetextedit::implicitSizePreedit() tst_qdeclarativetextedit::preeditMicroFocus() tst_qdeclarativetextedit::inputMethodComposing() Task-number: QTBUG-28109 Change-Id: Icb887ccb4d41a90472cf99342c9f2e500289f920 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_networkselftest as insignificant only on WindowsSergio Ahumada2012-11-231-1/+1
| | | | | | | | Task-number: QTBUG-27571 Change-Id: I93e55996158f4c5c18c65cc56877f21448d4564e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove QSKIP from tst_QGraphicsItem::updateMicroFocus()Sergio Ahumada2012-11-231-4/+0
| | | | | | | Task-number: QTBUG-9578 Change-Id: I8645f2154ab3cc9a414bec425abc5c08605866e1 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_QPauseAnimation as insignificant only on WindowsSergio Ahumada2012-11-231-1/+1
| | | | | | | Task-number: QTBUG-28069 Change-Id: I3e73a2f9af44735a0b50711f89ae57967a6fde0b Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_qdeclarativexmlhttprequest::send_ignoreData() as XFAILSergio Ahumada2012-11-231-1/+3
| | | | | | | | | | object->setProperty("reqType", "DELETE") always fails. Actually, this part of the test does not exit in Qt 5. Task-number: QTBUG-28004 Change-Id: Ia60f8c1c9bb4e780396327e8f8231771cec6889a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* BlackBerry: Removed filtering of window system eventsBernd Weimer2012-11-232-6/+8
| | | | | | | | | | | | | Only one event type can be passed to the event filter in Qt4. For the BlackBerry platform this will be BPS events. This should be acceptable, as there isn't any documentation stating that it should be window system events for QPA ports. In Qt5 the implementation is different (it is possible to pass the event type along with the event itself). Change-Id: I95550cec8a04a4994479904bc68544742a458aa9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* auto tests: only build help autotests when not cross-compilingPeter Hartmann2012-11-231-1/+1
| | | | | | | | | | ... because QtHelp and all other tools are only built when not cross- compiling. In Qt5, this is already fixed in the qttools repo. Change-Id: I151f8b4abe129def9f5f3717e72dea7dbd31fd73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Updated WebKit to 994432629cb04ffd8e1985dce9e9ed3a89236dd1Simon Hausmann2012-11-235-6/+15
| | | | | | | Includes fix for QTBUG-23258 and bumps the version accordingly Change-Id: Id5dd3c388cf6de88aea1b40bc9bdc2d5d6d80a31 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix error reporting in TDS SQL driver.Aaron McCarthy2012-11-232-2/+36
| | | | | | | | | | | | | | | | | | | | | The error and message handlers used by the freetds library were getting reset to back to the default every time a database was opened. The Qt TDS SQL driver was calling dbinit() from QTDSDriver::open(). This had two problems: 1. dbinit() would reset the error handler previously set by a call to dberrhandle(). A db error would then cause the application to abort. 2. freetds expects dbinit() and dbexit() to be called symmetrically. Opening multiple database connections would result in freetds not cleaning up on application close. Solved by moving the dbinit() call into the QTDSDriver constructor. Backported from Qt5/qtbase change 7456562e7f647e7cb2c854c4272c5599b26dbd37 Change-Id: I43087a44d74de38918c7285a228e2f3d25d070fd Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Qnx: Handle the MeasurementSystem in QNXmfekari2012-11-232-0/+100
| | | | | | | | | This is a back port from: 3853035a45abb87c94314ac9f61f0c454a7f0262 Change-Id: If31252555406cb7347e6f7b676cda3938c420f78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Fix regression in QXmlStreamWriter with codec set to UTF-16Jan Arve Saether2012-11-232-7/+47
| | | | | | | | | | | | | | | Actually, this broke using QXmlStreamWriter with any codec where characters in the ASCII range have a different encoding than the ASCII standard. This was a regression from 558fe9383ba0aecbec09cc411c0ebab132aac137 Backported from Qt 5 (035d93a6e1cbde76d34866ffd9b39633572e6236), and changed QStringLiteral to QLatin1String Task-number: QTBUG-23310 Change-Id: Iaaf25463737382ace1bdb83138c7dd634d825b30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make the rules for redirects a bit stricter.v4.8.4Richard Moore2012-11-221-3/+5
| | | | | Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* tests: Mark flaky tests as insignificantSergio Ahumada2012-11-222-0/+4
| | | | | | Task-number: QTQAINFRA-574 Change-Id: I385818d81d2565285e9402c0b6d63938f9019081 Reviewed-by: Richard J. Moore <rich@kde.org>
* Revert "QtConcurrent: Fix for leak in QFuture"Thiago Macieira2012-11-195-111/+13
| | | | | | | | | | This reverts commit 28b06b3ebae3d411c74f09fa7de52bc290c47dc3 That commit contains new symbols added in a patch release of Qt. That is not permitted. Change-Id: I1d36b50d4c26aa32072fd3f9c311a0e773527abd Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix failing tst_QWidget_window::tst_showWithoutActivating() test.Mitch Curtis2012-11-181-0/+1
| | | | | Change-Id: I3d7acf98f12ff71a6cea803ff7af430c66b972b8 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix regression introduced in QFileSystemEntry::path()Andy Shaw2012-11-182-2/+2
| | | | | | | | | | | | When fd2eb070128ab6ef6b5c9343a0921f6b5a0bc041 was backported it shouldn't have included the change to path() as this introduced a behaviour change. This reverts that part of the patch so it is back to Qt 4.8.2 behavior. Task-number: QTBUG-27356 Change-Id: I7c19dda473e7aa2c53baed961c3b0e0d322362fe Reviewed-by: João Abecasis <joao@abecasis.name>
* Fix compile issue with building with openssl and in a namespaceAndy Shaw2012-11-181-7/+11
| | | | | | | Task-number: QTBUG-25207 Change-Id: I20ab722d3fcb74d90d9010c5c7c303f586e0d7c7 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Make the qatomic classes work in ARMv5 OABI.Tomasz Duda2012-11-181-0/+16
| | | | | | | | | | | | | | | | The function testAndSetOrdered is not atomic. The context of a thread may be interrupted inside testAndSetOrdered and then if another thread calls fetchAndStoreOrdered, _q_value may be overwritten. After that _q_value will contain random value depending on where testAndSetOrdered was interrupted. It should not be possible for the atomic classes. Since the commit 8a7b5aca7b6575013a4e4ee9b99808d25edf6fdf introduced new implementation of QMutex for linux the bug causes deadlock. Change-Id: Ib9ffcf0e26d3be36a0e158fd12a363b97177dcbf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString doesn't work with old ABI on ARM.Tomasz Duda2012-11-172-2/+11
| | | | | | | | | | | | QString doesn't work on ARM platform with old ABI because QChar has wrong size. Macro Q_PACKED was removed by commit 1ec8acd77b6c048f5a68887ac7750b0764ade598. Some projects still use old ABI. It is better to check version of ABI during compiling. Task-number: QTBUG-15784 Change-Id: I92180b864679e01363fa837260707b67674d0a26 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed memory leak in assign operator of QGLBufferVadim Zakondyrin2012-11-171-1/+3
| | | | | Change-Id: I90b7e3f352fb7ceea7befabbab7d3b67213dd45f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Blackberry fixed crash when plugging in a secondary display.Fabian Bumberger2012-11-162-4/+4
| | | | | | | | This bug is only in the Qt4 version of the plugin. In Qt5 attaching a screen works just fine. Change-Id: I45ebc51c6da9999e7d2e4f453379fbc18dd6f857 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix code convention docsAlan Alpert2012-11-152-5/+6
| | | | | | | | | The previously specified convention prevents change handlers from being created properly. Another convention is being suggested instead. Task-number: QTBUG-27852 Change-Id: I32a3f6f6c01e628457b30479505b32f1c5bbc92c Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* test: Fix tst_qdeclarativexmlhttprequest failure on Windows.Sergio Ahumada2012-11-151-0/+3
| | | | | | | | | | | Disable line ending conversion for test data files so that they are served as lf on all platforms. Task-number: QTBUG-26703 Change-Id: Id5f5cdc2eeaf8acf92b9e2d903518c555f1741c1 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
* When clicking on a menu item which has a sub menu it should not closeAndy Shaw2012-11-151-0/+3
| | | | | | | | | If you clicked on a menu with a submenu then it should do nothing as this is what the native behaviour is on Mac. Task-number: QTBUG-10706 Change-Id: I7c8898b4b35a8189e1a8270d8a528eb56c81aed7 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* On 32bit applications it would not get out of the waiting stateAndy Shaw2012-11-151-1/+1
| | | | | | | | | Specifically for 32bit applications it would not get out of the waiting state when using the Cocoa API, the QuickTime API works fine in this respect so we can fallback to this instead. Change-Id: I768009c1e90e8c67ed518288971f11c3e7a1c2ee Reviewed-by: aavit <eirik.aavitsland@digia.com>
* test: Mark some tst_QGraphicsProxyWidget functions as XFAILSergio Ahumada2012-11-151-8/+23
| | | | | | Task-number: QTBUG-27885 Change-Id: I5b54713724a7bbe1458f6ca13cb7e3a59a24e877 Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
* Fix zero-duration animations running Backwards.Andreas Aardal Hanssen2012-11-152-1/+47
| | | | | | | | | | | | | | | | | | | If you set the duration of any variant or property animation to 0, its progress will be stuck at 1 (0..1), and its "end" value set on the target object, after start() has been called. If you change the direction of the animation to QAbstractAnimation::Backward, you would expect the progress to be 0 after start. Instead it's still 1; the code seems to assume that if the duration is 0, the progress must be 1 always. The fix is that if the duration is 0, the direction is checked to determine whether progress should be 0 (Backward) or 1 (Forward). Task-number: QTBUG-27969 Change-Id: Ibeca084bbbce41df1dca7b7d96c15b6b54394996 (cherry-picked from qtbase/f3597af5adcd2275503e9e4bfb425549f9ab3ced) Reviewed-by: Thierry Bastian <thierryb@filewave.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix scrolldown arrow not showing on popup for QMenuMiikka Heikkinen2012-11-141-2/+4
| | | | | | | | | | | | | | | | | Scrolldown arrow was not shown when a taller than screen QMenu was opened because the check to draw it used the size that was already adjusted to the screen. Fixed by using the actual menu size in the check. Also fixed the case where the menu was scrolled, closed, and reopened, in which case the size hint would return incorrect cached value. This led to scrolldown arrow not being shown in case the menu was previously fully scrolled down. Task-number: QTBUG-27445 Change-Id: Icd8d774071662a9317b3ac53cb05b31cadba96ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qt5/qtbase commit fe8eb057fa05433e96de21df34871647f421f962))
* Windows: Fixed handling of key events containing ctrl modifierOliver Wolff2012-11-141-0/+8
| | | | | | | | | | | | | | | QKeyEvent::key() returned the wrong value if the ctrl modifier was used in that key event. That was due to the fact that ToUnicode might not return the correct code for these events/keyboard states. While it works for alt+shift+= (us layout) and gives '+' as unicode value it just claims that it cannot translate the given state for ctrl+shift+=. So if the control modifier is used and ToUnicode return 0 toKeyOrUnicode should try again without the control modifier. Task-number: QTBUG-10781 Change-Id: I771f7ed18bcce60d1c7c3f6157d169d4e80ddd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Don't use Cocoa code unconditionallyAndy Shaw2012-11-141-0/+2
| | | | | | | | | | | The Cocoa code should only be used if QT_MAC_USE_COCOA is defined, this was causing problems in Carbon with menus which are now resolved. Task-number: QTBUG-27960 Change-Id: I60186d69a869def4b2f03f1b0fdde82208fcfbe5 Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix syntax error on configure.exe source code.Rafael Roquetto2012-11-131-1/+1
| | | | | | Change-Id: I4859e5f02d84791f59652298f62abe8d2984af06 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix binding of bool type in mysql driverMark Brand2012-11-132-1/+41
| | | | | | | | | | | | | | | | | | | MYSQL_TYPE_TINY should be used for binding bool input value. MYSQL_TYPE_LONG might be too big for bool, resulting in bools being saved in the database as int 127. The problem was not specific to the vendor's BOOL column type. http://dev.mysql.com/doc/refman/5.0/en/numeric-type-overview.html http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statement-type-codes.html Added generic autotest to make sure that binding bool works. All drivers should pass this test. Task-number: QTBUG-27763 Change-Id: I4e69f8e3b32fffb702ec9fa8a80ff5c50dea954b Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Bill King <bill.king@nokia.com> (cherry picked from qt5/qtbase commit 593b8f7f0b35ddc424d8ccbd5df11fcf2442858e))
generated by cgit v0.12 at 2024-10-30 06:53:31 (GMT)