summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove Qt3Support enums for q{dir,filedevice,settings,variant} in docsJeremy Katz2012-07-174-11/+0
| | | | | | Change-Id: I07942447bb756561e5c502c9a0c03b6aaf8133d1 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove documentation of previously deleted Accessibility eventsJeremy Katz2012-07-171-3/+0
| | | | | | Change-Id: I7996f2f9b6d11cea130e2a56d0997e1f208e5642 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove documentation of Qt3Support enums in qcoreevent.cppJeremy Katz2012-07-171-7/+0
| | | | | | Change-Id: Id8740adaa26ee44f40010373947a5be82942b0ba Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Install right version of tools when x-compiling.Rafael Roquetto2012-07-171-2/+2
| | | | | | | | When cross-compiling from a Windows host, we need to install the right (win32) versions of syncqt and qmake into the target folder. Change-Id: I35fc4b05bb6ad7605bc932cae527372a9fe0ba3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Normalize signal/slots.Sergio Martins2012-07-171-52/+52
| | | | | | Change-Id: I0a0f497ece081a430437adc2959deb247defcde9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix infinite loop due to FPU limitationStéphane Cerveau2012-07-171-2/+2
| | | | | | | | | | Bug detected with animatedtiles in example/animation. In qpa mode, using some specific resolution of directfb such as 800x600 causes a bug in FillRectF where there is an infinite loop due to scalabilty of qreal value: One is rounded and the other not. Change-Id: I1707e53f34aeeadc0f0fc07b1dca148fbe05b5f1 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QSqlTM: add reimplemented record() methodMark Brand2012-07-172-3/+34
| | | | | | | | | | | QSqlQueryModel::record(row) populates the record it returns with values from virtual data(), so the values themselves can be supplied by QSqlTableModel. However, it is also desirable to be able to interrogate QSqlTableModel for the actual current record in its cache, including properties such as the generated flag. Change-Id: I733901913b7d237d5762448e953a99b5bd83fc7f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QSqlTM: use generated flag more correctly in setRecord()/insertRecord()Mark Brand2012-07-172-13/+22
| | | | | | | | | | | | The generated flag should affect the generation of SQL commands rather than how the fields of the source record are applied to the model before submitting. This correction allows setRecord() to be used to change TRUE generated flags to FALSE. Clarified documentation on this point and updated change log. Change-Id: I7ee124930822561ed8beee6c6259970b3e929c9b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Don't join between 2 same pointsCharles Yin2012-07-171-2/+4
| | | | | | | | Joining 2 points with same x,y values causes assert in QTriangulatingStroker::normalVector(). Task-number: QTBUG-26528 Change-Id: I2494d7f362e13e41a82753f4bacf97ffbc249cf9 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fix error when inserting to tables with datetime fields with QODBCThiago A. Correa2012-07-162-5/+69
| | | | | | | | | | | | | SQL Server 10 introduced stricter rules for TIMESTAMP validation, making it necessary to specify the decimal digits. Other databases might do the same as well, so this patch introduces a check for the TIMESTAMP column size and adjusts the decimal digits parameter as needed. Task-number: QTBUG-2192 Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* List .pbm and .pgm as supported writable image file formats.Kim Motoyoshi Kalland2012-07-161-1/+3
| | | | | | | | | QImageWriter can write .pbm and .pgm files, but didn't list them among its supported image file formats. Task-number: QTBUG-22958 Change-Id: I777c7cd9a4b56fcf313248a29a917e594a5e4477 Reviewed-by: aavit <qt_aavit@ovi.com>
* QStateMachine: mark a ctor as explicitMarc Mutz2012-07-161-1/+1
| | | | | | | | Commit 0b66f723f06f6d115ea37d4db8bb6c0b5f63885b recently introduced a new QStateMachine constructor, but failed to mark it as explicit. Fix. Change-Id: I16037691ad77d528bb50b611c03063b17a71dd34 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* undocument enums as part of Qt3Support removalJeremy Katz2012-07-161-124/+1
| | | | | | | | | Lots of enums in the Qt namespace used to be hidden or documented as obsolete. These have been removed entirely, as they result in qdoc errors. Change-Id: I67726d7358f4e71a0c8fc5181388b1cf8fd4e4bd Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add gui/ to qtcore.qdocconf to pick up enums in Qt namespaceJeremy Katz2012-07-161-1/+2
| | | | | | | | | Qt::HitTestAccuracy and Qt::WhiteSpaceMode are defined in gui/ but documented as part of the Qt namespace, so qdoc needs to look there to find the relevant enums. Change-Id: I36ae71c44024b12664688129044994926160e5c9 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* remove support for forwarding module pri creation via syncqtOswald Buddenhagen2012-07-163-63/+11
| | | | | | | | | now that all modules have migrated, this dead code can be removed. Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Generate a fatal error as appropriate.Stephen Kelly2012-07-161-1/+3
| | | | | | | | | | | | | | Otherwise, subdirectories under directories which are added to a resource file generate garbage in the binary. The easiest way to see this is cd tests/auto/corelib/kernel/qvariant mkdir stream/qt4.9/somedir make && ./tst_qvariant loadQt4Stream Change-Id: I32630ecb6d515db1d135f0ffc5cf14fd8caa0a4f Reviewed-by: hjk <qthjk@ovi.com>
* Create imported targets if the library files existStephen Kelly2012-07-162-0/+27
| | | | | | | | | | | | | | | | | | Handle the cases where the user does ./configure -debug make make install make release make release_install Thereby making the installed configuration different to the 'configured' configuration. Change-Id: Ib351d8a84c4333ebcbd305d68a37c16f86869559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Undocument Qt::AnchorAttributeJeremy Katz2012-07-161-12/+0
| | | | | | | AnchorAttribute was removed as part of the Qt3Support cleanup. Change-Id: I58d8e471d4bc1af420ec8eaab6d34c1718b30382 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QWidget::showFullScreen fixed for widgets with valid size hintJoerg Bornemann2012-07-161-0/+4
| | | | | | | | | | Ensure the initial size is valid, since we store it as normalGeometry below. Task-number: QTBUG-26226 Change-Id: I3a55c389a48504699942930063089c80657687a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Replace Q_WS_ in tests by Q_OS_ or check platform names.Friedemann Kleint2012-07-1610-30/+25
| | | | | Change-Id: Ica445cf1e83bfaab870ac344d6c02766f047a5cc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* tst_qwidget: check widget geometry in fullscreen modeJoerg Bornemann2012-07-161-0/+10
| | | | | Change-Id: Idc45c6d18decf3c71c6736742434ad9d0cccd2d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix window size issue under Windows CEAndreas Holzammer2012-07-161-0/+2
| | | | | | | | | | | | | | Under Windows CE the top title window bar needs to be taken into account when creating a window, so the Style WS_OVERLAPPED needs to be passed to AdjustWindowRectEx, to get the right size of the window. For the desktop the documentation says, that you should not pass the WS_OVERLAPPED flag, but wince does not talk about this. Change-Id: Id8c9d28b7aa04a9920e4cb81ac11463d9717a0e7 Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove #ifdef Q_WS_ / include / #endif conditionals.Friedemann Kleint2012-07-1610-38/+0
| | | | | Change-Id: I734490ddcb5501e620370e50ef06180ab5e23393 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix applicationName() being empty in QApplication.David Faure2012-07-165-24/+27
| | | | | | | | | | | | | | | A virtual method was reimplemented to return an always-empty string, probably a leftover from a refactoring. This fix showed that tst_qwidget_window was buggy: between Qt4 and Qt5, a "Before" became "After", which made "Before" unused, and was masking the fact that the app name was empty by default. In addition, the earlier Qt5 change that made the app name default to argv[0] now requires updating this test, now that it's actually working. Change-Id: I5360026821a9b95bedd0ff09dba3d51a22e542b7 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Improve qDebug() << QAccessibleEvent() to display state changesJan-Arve Saether2012-07-161-0/+44
| | | | | Change-Id: I4624bcf94c1290d14ea5f5eaaa5449af10ac2186 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Doc: Fix typoSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-23657 Change-Id: I3115f45f743da5699aa13f31a0f2de013d428aba Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Added a reserved data pointer in QPaintDevice.Alexandros Dermenakis2012-07-162-0/+4
| | | | | Change-Id: If547e5525635e7c76db7a02c7c0c300c87373a18 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Doc: Fix typo foreigh -> foreignSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-23260 Change-Id: I922a8b5cba5d8784305fb1779ccd352ab2ece365 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* handle XInput 2.2 multipoint touch eventsShawn Rutledge2012-07-162-15/+221
| | | | | Change-Id: I5c925ae3e191244c7ab9415e4ba2fe49b93dd2af Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Remove QToolButton's protected constructorIvan Komissarov2012-07-162-10/+0
| | | | | | | | | | As long as QToolButtonPrivate is declared in .cpp file, this constructor is useless. Change-Id: Ibbeaf291b88b3b203e5107e0227d68e65cbb9eee Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QSplashScreen on X11.Friedemann Kleint2012-07-161-6/+33
| | | | | | | Use code from QTestLib to wait for the Window to show up. Change-Id: Ib674f3eb7a6c32cad1d502caefe7d4b073754e73 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Use DropShadow from QPlatformTheme everywhere in qwhatsthis.cpp.Friedemann Kleint2012-07-161-15/+9
| | | | | Change-Id: Ib8281d44e2d4b51aba13417c26247d3e19b1b2f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Replace some Q_WS_X11 by check for platform's name.Friedemann Kleint2012-07-163-15/+10
| | | | | Change-Id: I33d7ce31e01c355e0d9e05c98d6a84ea4f6d5bbd Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix the use of if() inside of macro().Stephen Kelly2012-07-161-1/+1
| | | | | | | | | if() seems to behave differently with macro parameters compared to variables set with set(). Change-Id: Ieb9544b8c3187579fd4cfe25e2c2afa3f349eba6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make qwindowsysteminterface.cpp compile with QT_NO_SHORTCUTJeremy Katz2012-07-161-0/+25
| | | | | | | | Task-number: QTBUG-24816 Change-Id: Ia3d20775d28922ee94f965b4a7bc993915f34d6b Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Fix crash in QPixmap::fromImage() when memory is low.Kim Motoyoshi Kalland2012-07-161-10/+11
| | | | | | | Task-number: QTBUG-26451 Change-Id: I7149edb1b03d7bcd4e90f369a1ac99b25ab262b9 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* statemachine: Move RestorePolicy enum to QState classKent Hansen2012-07-167-66/+64
| | | | | | | | | | This makes it possible to add API for setting the restore policy per state, or even per property assignment (QTBUG-17861). This change is fully source compatible with Qt4. Change-Id: I53628546b070f6fc84891f86e7ad7bd8ef5ba285 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Add QStateMachine constructor that takes a ChildModeKent Hansen2012-07-163-0/+57
| | | | | | | | | | | | Back when QStateMachine was changed to inherit QState, this constructor was conveniently left out because setting the state machine (root state) to be a parallel state group didn't actually work. But as of commit d281aa6936ad01e28dacabb41bd9eb59891f85a1, it does work, so add the missing constructor. Task-number: QTBUG-15430 Change-Id: I68c599baa0ef1bfc869195140cf5daf645e75b8b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* make QMAKE_RESOLVED_TARGET use normalized path separatorsOswald Buddenhagen2012-07-162-2/+1
| | | | | Change-Id: I23433a67364a9d09fa239b2c7f2cae495d3cc6df Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make use of new functionsOswald Buddenhagen2012-07-165-18/+9
| | | | | | | makes for cleaner code Change-Id: I1a86bc4cac3778a1df37aa3307e5a8edac246961 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* automatically fix separators in QMAKE_{DIST,}CLEANOswald Buddenhagen2012-07-165-6/+17
| | | | | | | it's a tad insane to expect the user to do that Change-Id: I75c68f2a28656c9ba2e3fabcc79718b899b29ce7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix object file name clashOswald Buddenhagen2012-07-163-0/+3
| | | | | | | under extremely rare circumstances this would have actually failed Change-Id: I4132d0f82e9f924e92e9e96f6d34451c94a67201 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Test QVariant copy with a user type instead of a QtNetwork type.Stephen Kelly2012-07-152-9/+19
| | | | | Change-Id: I78acc8a843eb12a2606f491d1a29e1bcd408d60f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Run QIcon related crash test with the other QtGui types.Stephen Kelly2012-07-141-2/+2
| | | | | Change-Id: I475cfc5a91a046951feecb425f8235ad37f1ba44 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Don't declare built-in metatypes as metatypes again.Stephen Kelly2012-07-141-23/+0
| | | | | Change-Id: Iba9804299e8f6e2db10965fdc719ee26f197758e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix typo qith -> with.Stephen Kelly2012-07-141-1/+1
| | | | | | Change-Id: Ie9eaa016c61f929be17fd1687517540c2ae1f3d2 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Avoid crash when getting bearings from fallback font engineEskil Abrahamsen Blomfeldt2012-07-141-0/+1
| | | | | | | | When accessing a fallback engine, we always need to call ensureEngineAt() to make sure it's loaded. Change-Id: Ib27e34137cfe8a3dd2b358aef3b3296a4ca52478 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add some tests to note that private signals can't be overloads.Stephen Kelly2012-07-131-0/+88
| | | | | | | | | This is just for completeness of the understanding of the limitations of private signals. There are no private signals in Qt which have overloads. Change-Id: Ic34c555aea360ee34beec796e597657888573da9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Simplify the moc code related to private signals a bit.Stephen Kelly2012-07-132-10/+21
| | | | | Change-Id: I0e9bae82c7c6d313e4161c35d0b988f633d5ae60 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* [QNX] Force UNIX-style separators on Windows hostsRafael Roquetto2012-07-131-0/+5
| | | | | | | | | The QNX toolchain, even on Windows, uses UNIX-style directory separators ('/'). Change-Id: I78575c9856b1700438c05ec0da81149688d85522 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>