summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-171-11/+19
| | | | | | | | | | | | 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-161-4/+42
| | | | | | | | | | | | | 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>
* 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>
* 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>
* 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-164-16/+0
| | | | | Change-Id: I734490ddcb5501e620370e50ef06180ab5e23393 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix applicationName() being empty in QApplication.David Faure2012-07-163-9/+1
| | | | | | | | | | | | | | | 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>
* 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-165-44/+42
| | | | | | | | | | 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-162-0/+15
| | | | | | | | | | | | 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>
* 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>
* 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: normalize signals/slotsMarc Mutz2012-07-131-4/+4
| | | | | | | | | | | This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I9229c3c52ba785194469ad51aba0c3af0c058894 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* plugins/bearer: normalize signals/slotsMarc Mutz2012-07-135-66/+66
| | | | | | | | | This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I7c9539056a4434ed10a0255152eac1781f7833be Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* input/evdevmouse: normalize signals/slotsMarc Mutz2012-07-131-2/+2
| | | | | | | | | This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I4afac23e897404ac7efb5b4a89493a2c15e3c670 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only create the Qt5::WinMain target if it doesn't exist yet.Stephen Kelly2012-07-131-11/+13
| | | | | | | | Multiple calls to find_package(Qt5Core) would otherwise attempt to create multiple targets of the same name. Change-Id: I5639671fec66d4dd62dcce018dea5d18dcfd3dc3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make sure the emulated mouse event comes lastKevin Ottens2012-07-131-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | With the recent refactoring in qtdeclarative for the handling of touch and mouse events, QQuickCanvas automatically transforms touch events in mouse events too. It means that since we do something similar in the platform plugin, in the case of QQuickCanvas the mouse event is duplicated. It it fine except that having mouse event, touch event, mouse event in that order is likely to mess the states of some elements. It happens to be the case for MouseArea which will discard the second mouse event in the case of a press, and because of that not receive the other events. By changing the order in the plugin, we ensure getting events in the following order: touch event, mouse event, mouse event. In the case of MouseArea, since the press event will be accepted with nothing in between, we'll keep receiving the other events. Note that we can't simply remove the mouse event simulation on our side, otherwise we'd break QWidget support. Change-Id: If08fe0d97c6d60d0f858b228a014d94bc86dcf6f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* statemachine: Micro-optimization for signal transition connectKent Hansen2012-07-131-4/+4
| | | | | | | | | | It's silly to call one virtual function plus one function that walks the inheritance chain, on every signal transition connect and disconnect, when the method offset of the internal QSignalEventGenerator class cannot change. Change-Id: Ic4e83bdc6ab445ea8ca00f3d8da3031250621e2f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* statemachine: Use new Qt5 api for obtaining method parameter typesKent Hansen2012-07-131-3/+2
| | | | | | | This is much faster than the string-based api. Change-Id: Id7ba76aee3346dd90412ec5c8505329360aae937 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* statemachine: Make signal transition registration thread-safeKent Hansen2012-07-132-0/+11
| | | | | | | | Since Qt's connections are thread-safe, QStateMachine's plumbing around them should be thread-safe too. Change-Id: I8ae91c2edc2d32ca4ed4258b71e5da22de30ed91 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* statemachine: Fix signal transition handling in multi-threaded setupKent Hansen2012-07-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, QStateMachine lazily registers signal transitions (i.e., connects to the signal) when the transition's source state is entered. The connections are established in Qt::AutoConnection mode, which means that if the sender object lives in a different thread, the signal processing will be queued. But if a sender object's signal is used in an out-going transition of the target state of the queued transition, it's possible that a second signal emission on the sender object's thread will be "missed" by the state machine; before the machine gets around to processing the first queued emission (and registering the transitions of the new state), a sender object on the other thread could have emitted a new signal. The solution employed here is to eagerly register any signal transition whose sender object is on a different thread; that is, register it regardless of whether the transition's source state is active. Conversely, when a machine's transitions are unregistered (i.e., because the machine finished), signal transitions with sender objects on other threads should be left as-is, in case the machine will be run again. This doesn't solve the case where the sender object is moved to a different thread _after_ the transition has been initialized. Theoretically, we could catch that by installing an event filter on every sender object and handle the ThreadChange events, but that would be very expensive, and likely useless in most cases. So let's just say that that case isn't supported for now. Task-number: QTBUG-19789 Change-Id: Ibc87bfbf2ed83217ac61ae9401fe4f179ef26c24 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* statemachine: Small refactoring of transition registrationKent Hansen2012-07-135-14/+46
| | | | | | | | | | | | | | Split the guts of registerTransitions() into a registerTransition() function. This allows a particular transition to be registered, instead of walking the source state's whole list of transitions every time. Move the logic for determining whether a transition should be registered to the state machine, since that's also where the actual registration takes place. Change-Id: I0496dee9454cd77b62cf2768942a82a96b320744 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* linuxfb: fix style in QFbCursorGirish Ramakrishnan2012-07-132-45/+46
| | | | | | | Fix coding style, constness, m-prefix for member variables. Change-Id: I9d75b410b398e5c3084b086b41884f2a0ddd6e5e Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* statemachine: Fix dynamic transition registration edge casesKent Hansen2012-07-132-0/+3
| | | | | | | | | | | | Some of the transition constructors didn't call the maybeRegister() function, causing the transitions to be ignored if they were created when the state machine was running and the transition's source state was active. Added tests that cover all possible cases. Change-Id: If1b593b127bd719e3be4e5a2e6949a780c4e97c3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* statemachine: Avoid warning when setting up signal transitionKent Hansen2012-07-131-0/+2
| | | | | | | | | | If the sender object was set, but not the signal signature, the registration would proceed anyway, producing a strange warning like QSignalTransition: no such signal: MyObject:: Change-Id: If0b113bdb60dd770d60b0d38d509b673e9d8c5eb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* statemachine: Set correct signal index when signal is non-normalizedKent Hansen2012-07-131-0/+1
| | | | | | | | | | | | The originalSignalIndex member was not set if the signature had to be normalized. This caused the SignalEvent passed to onTransition() to report a signal index of -1. Improve the signal transition tests so they check both the event passed to eventTest() and onTransition(). Change-Id: I5331fd1944d53310b6d11eb2fd8713b80faa53a1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* doc/snippets: normalize signals/slotsMarc Mutz2012-07-1310-27/+27
| | | | | | | | | | | | | There's one in corelib that has a comment // slower due to signature normalization at runtime I obviously didn't change that one. This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I0ffb2305800a9cb746b7f8a4eb710702d64f1b92 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QtWidgets: normalize signals/slotsMarc Mutz2012-07-131-1/+1
| | | | | | | | | | This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I024d48cd111ab89f3fe83d9df51b188c9ad5023c Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Debao Zhang <dbzhang800@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QNX: Fix flushing the backing store to non-owner windowsThomas McGuire2012-07-134-15/+63
| | | | | | | | | | | | Multiple windows can share the same backing store, which we did not take into account. Don't ignore the window parameter in flush() to fix that. Change-Id: I4f98bba34d4da9134163e478cb78cab4ca0358d2 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QNX: Extract and move adjustBufferSize() functionThomas McGuire2012-07-133-5/+9
| | | | | | | | Change-Id: Ia1719314460b9c51d6eba04ab1c43f02be1777b6 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QNX: Apply state from QWindow when creating new QQnxWindowThomas McGuire2012-07-131-2/+5
| | | | | | | | | | | Otherwise things like the window position and the parent/child relation were wrong. Change-Id: Ibe22a54f093f187e510f9c4258db2d80abe54a81 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Improve accessibility test helpers.Friedemann Kleint2012-07-131-4/+27
| | | | | | | | | - Wait for accessibility events using qWait, allowing for event processing, - Output a verbose message if the event cannot be found. Change-Id: Iaadbd235c15dd12bb14724e1724dd04328532a96 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 20:05:01 +0000