summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Provide public API for native event filtering, moved up from QPA.David Faure2012-07-2032-335/+422
| | | | | | | | | | | | | | | | | | The previous API was hard to use (global function, no type safety, manual chaining), and confusing (app vs dispatcher split only made sense on Windows). Installing and removing out of order would have the risk of setting back a dangling pointer (crash). Meanwhile QPA added type safety, and this new API models the QObject::installEventFilter API for ease of use. The virtual method is in a new interface, QAbstractNativeEventFilter. QPA was even calling the dispatcher event filter with QPA-private event classes, which made no sense (refactoring leftover from when the code was in the dispatcher). Now the QPA plugins trigger the qcoreapp event filters with the actual native events directly. Change-Id: Ie35e47c59c862383bcaf857b28d54f7c72547882 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* TYPO: Fix typo in warning messageMontel Laurent2012-07-201-1/+1
| | | | | Change-Id: I322f97257210f123695e386670a9a4eea2ccfe0e Reviewed-by: David Faure <faure@kde.org>
* Doc: Fix QUrl::isLocalFile documentationSergio Ahumada2012-07-201-1/+1
| | | | | | | | | | This function was introduced in 4.7 by a2f797b52c4274a62a7cf1f0939aca1429afe211 but then reverted by 98e935eed5549e479f6666680aed1711dc42111c Task-number: QTBUG-21293 Change-Id: I6ec9c6696e5c85e44774184010eb9135ef7f3365 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Tests: Replace deprecated QPixmap::grabWidget() by QWidget::grab().Friedemann Kleint2012-07-205-23/+23
| | | | | Change-Id: I5018cf5dd51c1781e7f17c7d205f3f60de7945be Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Don't create cmake files for QtPlatformSupport.Stephen Kelly2012-07-201-0/+6
| | | | | | | It is for internal use only, not third party use. Change-Id: I7a8dbc930e794ccdad4cc5591b454a640b921bb0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Activate native window tests of QMdiArea.Friedemann Kleint2012-07-201-5/+6
| | | | | Change-Id: Ic272b5e28256e454a3186d4407d009c9331b292b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement waitForWindowExposed and friends for widget windows.Friedemann Kleint2012-07-2043-559/+352
| | | | | | | | | | | | | | - Implement waitForWindowExposed() for toplevel windows. - Implement waitForWindowShown(QWidget *) and mark as deprecated in line with waitForWindowShown(QWindow*). - Use in tests. - Simplify tests (collapse waitForExposed, setActive into setActiveWindow, waitForActive), remove most hard-coded timeouts. - Stabilize graphicsview tests by using waitForWindowActive. Change-Id: Ic7c061e2745b36f71a715ee4e47c0346b11a91e8 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove unneeded Windows CE dummy functionsAndreas Holzammer2012-07-201-5/+0
| | | | | | | | | With the change I69f4d5d504e2341555d9991c68e82beed2e8129c IsZoomed function is no longer needed. Change-Id: I07239f3e81509f8a966e64ee9705a04ea41cb38d Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Implement nativeResourceFunctionForContext for kmsElvis Lee2012-07-202-0/+25
| | | | | | Change-Id: I4e0486744f4c3eb711a9252c90b0d06c5bb3c670 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Reset drm cursor position if cursor image is set before movedLaszlo Agocs2012-07-202-1/+7
| | | | | | | | Do not let the cursor appear at some random position and then jump back to the top-left corner when first moved. Change-Id: I0b77763bdfa86c23435d6cc07bdc13dfcc682567 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Hide drm cursor when exitingLaszlo Agocs2012-07-202-0/+7
| | | | | Change-Id: Ib4e1895dcf3e0168eb759fbecee499d75dd45bfe Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* qdoc: Restricted qdoc errors for \reimp commandMartin Smith2012-07-201-26/+28
| | | | | | | | | | | qdoc no longer considers the \reimp command when the parent C++ class has been marked \internal, because the reimplimented functions aren't supposed to be in the documentation at all, when the parent class is internal. Change-Id: I3d811ca737934f95e9078ce7b1e957890f6aaf38 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Disable threaded rendering with kms pluginLaszlo Agocs2012-07-201-2/+1
| | | | | | | | The page flip handling in QKmsScreen cannot currently cope with contexts on multiple threads. Change-Id: I9492095fec52fd1ad0197db00b3d6a2f58016e6d Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Doc: Removed Double Buffer example.Jerome Pasion2012-07-201-186/+0
| | | | | | | | | -The example no longer exists Change-Id: I05485e950ca39918117cddee928f3c9da0fe1cb8 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed most qdoc errors for the json classes.Lars Knoll2012-07-206-39/+221
| | | | | | Change-Id: Ibbbdd7212f6c5e25422bbaa9ccaf4822db52222a Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Don't update geometry while the style is setAndreas Holzammer2012-07-202-1/+7
| | | | | | | | | | | | Under Windows CE a resize event gets fired when the style is set, this will produce geometry change events inside Qt, which will end up in changing the geometry back and forth. Change-Id: I7f834997abc53760ccfe2ad97012bb74dc5c705c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Move QWindowSystemInterface out of qpa.Stephen Kelly2012-07-1951-58/+55
| | | | | | | | Public QtTest headers require it, so all unit tests would have to use private Qt headers otherwise, which is not practical. Change-Id: I5d4466ec30b6a57ebdfc34413e716e657eb51368 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* qdoc: Removed three qdoc files for qws example papgesMartin Smith2012-07-193-790/+0
| | | | | | | | | | qws is no longer relevant. These pages are now deleted: deleted: mousecalibration.qdoc deleted: simpledecoration.qdoc deleted: svgalib.qdoc Change-Id: I6ca77627cc6c018245cf16047b52c1145721e175 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Enable CUPS auto detection on WindowsRafael Roquetto2012-07-191-0/+8
| | | | | | | | | Detect CUPS availability automatically when cross-compiling from a Windows host. Change-Id: Ife9bb90732c39794a7b760ced4aaea232612fe54 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QWidget/Win: fix restoreGeometry() from fullscreen modeJoerg Bornemann2012-07-193-5/+14
| | | | | | | | | | | | | | | When turning off fullscreen mode and restoring the widget's geometry we must inform the QWindow about the geometry change synchronously. Otherwise QWidget::geometry() will return the old value. Using the same technique for the state transition to fullscreen mode without sending a separate resize event. Autotest: tst_QWidget::saveRestoreGeometry Task-number: QTBUG-26421 Change-Id: I869e36cd302d9a94e398f48949ab3cb7ee9cdf51 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove Q_UNUSED for the metaObject.Stephen Kelly2012-07-191-2/+0
| | | | | | | | | The object is no longer unused. Change-Id: Ia82539220855321f2986c5791b70be5df399baca Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove the test tst_qdialog::throwInExec().Friedemann Kleint2012-07-191-54/+0
| | | | | | | | QtWidgets and QtGui are currently compiled without exceptions, which causes a crash with gcc 4.6.3. Change-Id: I8f872f3bec6266444adf08d51a6678150c5fae8e Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QDoc: Fix make commands for QDoc manual.Casper van Donderen2012-07-192-10/+8
| | | | | Change-Id: I55c3eae43928e87a0aa470127f9877741391deee Reviewed-by: Martin Smith <martin.smith@nokia.com>
* fix "No such ..." doc error for QString::toHtmlEscapedJeremy Katz2012-07-191-1/+1
| | | | | | | And a minor rephrase. [...] a HTML -> an HTML Change-Id: I49804d009737b58ca3bb43e60dac869e045b5536 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* fix "No such ..." in qmarginsJeremy Katz2012-07-191-2/+2
| | | | | | | | | Is it more appropriate to rename the parameter in question "margin", as suggested by the documentation, or have the documentation refer to "m", as suggested by the code? Change-Id: I5768ef044164e099ef1db77adda42171799cbf12 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* fix "No such ..." doc error for Qt::WindowType WindowOverridesSystemGesturesJeremy Katz2012-07-191-1/+1
| | | | | | | Is this a typo in the documentation, or in the enum? Change-Id: I58ba12d74694b26ec0bf76226b56337a12e0756e Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* fix "No such ..." error in qnamespace.qdocJeremy Katz2012-07-191-3/+0
| | | | | | | | RIP Qt::ClipOperation UniteClip See 01b72952c38b9193138eabdab6bdab632cd75ebd for details Change-Id: I8cfd5f6d008374741bea4f6a85827545ddb8ae86 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* fix "No such ..." doc error for QMetaType::typeName()Jeremy Katz2012-07-191-1/+1
| | | | | Change-Id: If00c728ec793a65f62d76d8301c7f6658e7af8a0 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* fix "No such ..." in doc for QMetaEnum::keysToValue()Jeremy Katz2012-07-191-1/+1
| | | | | Change-Id: I4cc15031970a34ee1076933f7f13468ee17abcfd Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* fix "No such ..." doc error in QBasicTimer::start()Jeremy Katz2012-07-191-1/+1
| | | | | Change-Id: I52feb5f2ebcc8821470468fc51ed3acc6df92a67 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add another directory to the private INCLUDE_DIRS list.Stephen Kelly2012-07-192-2/+13
| | | | | | | | | | It should be possible to include both: * <QtGui/private/qfoo.h> * <private/qfoo.h> Change-Id: I83ed5bba633b4a6b9bd38e315c987d78beecfb1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Dereference so we can be sure the type is not forward declared.Stephen Kelly2012-07-191-1/+3
| | | | | Change-Id: I4d67a08dc645649e767153f3aa0dc57b15d50a84 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix window state handlingAndreas Holzammer2012-07-192-28/+9
| | | | | | | | | | | There is no need to query each time the window state from windows, as we already know in which state it is. We are also getting state change notifications. This fixes issues under Windows CE. Change-Id: I69f4d5d504e2341555d9991c68e82beed2e8129c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix "No such ..." for QMimaeDatabase::mimeTypeForFile()Jeremy Katz2012-07-191-1/+1
| | | | | Change-Id: Ife8e361524ac324ce2cfb20d952db5be042fecc1 Reviewed-by: David Faure <faure@kde.org>
* fix "No such ..." for QObject::connect(...,functor) docJeremy Katz2012-07-191-2/+2
| | | | | Change-Id: Idd1d871b0fde899fdd21ce5aa365e08e2c7bcf45 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* fix "No such ..." documentation errors in QAbstractItemModelJeremy Katz2012-07-191-3/+3
| | | | | Change-Id: Ic1d0761c310c47f95d98988d77aff0f8e46de5fb Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Improve Windows XP and Vista styles auto detectionRafael Roquetto2012-07-191-1/+1
| | | | | | | | Do not build windows styles when the target platform is not Windows. This makes a difference when cross-compiling. Change-Id: I2184d39ed253af1069c5cdcd6a848611cff24789 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use QT_INSTALL_LIBS directly instead of messing with QMAKE_LIBDIROswald Buddenhagen2012-07-181-1/+4
| | | | | | | this is what this code assumes anyway Change-Id: I667412b101c18325321a568cc22d25ef07418ffb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove QTDLL_POSTFIX stuffOswald Buddenhagen2012-07-182-11/+2
| | | | | | | | | the libinfix provides a way cleaner solution to that. i don't expect it to be still actually used anyway. Change-Id: I051522ec3abb3d92c529b5462b8514a706aa2ba1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* remove needless/commented INCLUDEPATHsOswald Buddenhagen2012-07-182-2/+0
| | | | | | | Change-Id: Id1d3afde424e0e17e68889d6f7b51e3056754536 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* qmetaobject_p.h: don't (incorrectly) fwd-declare QVarLengthArrayMarc Mutz2012-07-182-2/+1
| | | | | | | | | | qmetaobject_p.h forward-declared QVarLengthArray without the default parameter for the 'int' template argument. This violates the ODR, so just #include the header instead. It's not like there's much point in the fwd declaration in a private header. Change-Id: Ie5ef1740c57da396c95f5bae1cd81ac941a8ac2d Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix typo in configure for Mac: Libraries -> LibrarySergio Ahumada2012-07-181-1/+1
| | | | | | Task-number: QTBUG-18115 Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* put the include/ of all modules into qtbase when doing non-prefix buildOswald Buddenhagen2012-07-183-3/+12
| | | | | | | | | all other build artifacts go into qtbase's build directory anyway. this asymmetry was confusing and causes cmake users some grief. Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* generate the module version header directly in the include directoryOswald Buddenhagen2012-07-181-3/+7
| | | | | | | | | ... instead of having a forward from the include dir to the (shadowed) source dir of the module. Change-Id: I967227950e8aeb1b9f62befbf9fff3746a0486b6 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make the QIncompatibleFlag constexpr.Stephen Kelly2012-07-181-3/+3
| | | | | | Change-Id: If99b43b45cc667449dbe7c487b56885c6ce9b1c7 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Track window state in manual test windowflags.Friedemann Kleint2012-07-182-15/+39
| | | | | Change-Id: Ief6cd4b29ddcc946e1ccac75b352da80bbf647d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix rendering glitches when using native widgets in MDI subwindowsMiikka Heikkinen2012-07-183-10/+3
| | | | | | | | | | | | | | | | | | | | When mixing native and regular widgets in same QMdiArea, some subwindows didn't properly get set native. This was because when a native parentless widget was given a parent, it wouldn't enforce native window on the new parent and its ancestors. This happened because window flags were adjusted too late in relation to createWinId() call in setParent_sys(). Fixed by moving the createWinId() call to its proper place. Also removed some old Q_WS_* ifdeffing in QWidget::setParent() that masked some native enforcement code. Additionally removed few QEXPECT_FAILs from QWidget autotest now that those cases work correctly. Task-number: QTBUG-26424 Change-Id: Ib6f9d0531e5c7299e2c307734d49c81f1ffa9713 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Widgets: Fix duplicated line in QMdiAreaSergio Ahumada2012-07-181-1/+1
| | | | | | | | Replace duplicated line MaximizeAction with RestoreAction Task-number: QTBUG-17428 Change-Id: I5120afeed6715d28045f3eee01f26ee482f02ed1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtNetwork: normalize signals/slotsMarc Mutz2012-07-183-9/+9
| | | | | | | | | | This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I3f89d5138ea9905c42ed581991426e72c90d4069 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Auto detect iconv on Windows hostsRafael Roquetto2012-07-181-0/+7
| | | | | | | | Enable auto detection for iconv when cross-compiling from Windows hosts. Change-Id: I699e0a31d938403f5e80e74be90df87f11f361ba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>