summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* make sure that the stale header removal works the first time aroundOswald Buddenhagen2012-07-271-1/+1
| | | | | | | | | | sort backwards by ascii, so that the lowercase headers come first - otherwise the camelcase headers would survive the first round, as they include the lowercase forwarding headers which were not deleted yet. Change-Id: Iece2788206d31a11428f38da8d8f9f4d0b6dc992 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix crash in QVariant::canConvert().Volker Krause2012-07-272-11/+22
| | | | | | | | | When containing a QObject (or sub-class) pointer and trying to convert to a QObject pointer canConvert() did dereference the pointer without checking for it being null. Change-Id: Ie274e54f2f817f2b6c5df64504f8af6359b8f38d Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* fix QVariant qdoc error - mark const QVariant::data_ptr() internalJeremy Katz2012-07-271-0/+5
| | | | | | Change-Id: I1df93780f271ce06c3aa10c4bdcc1c2a43097b72 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix QUrlQuery qdoc errorsJeremy Katz2012-07-271-5/+28
| | | | | | | | | Add missing documentation for toString() and operator!= Mark data_ptr() and associated typedef internal and some qdoc tag usage issues Change-Id: I0ad5a2c767fb742d9a86ae259c0c11a0f5db64b4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Introduce QTypeInfoMerger.Jędrzej Nowacki2012-07-273-12/+47
| | | | | | | | | | | | QTypeInfoMerger class was created to allow "inheriting" QTypeInfo traits. The class implementation was based on the QTypeInfo<QPair<>> specialization, therefore the specialization was refactored to use the new class. Change-Id: I4ff3e5eac1d55da086dad84274cce2b2c0a721be Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* examples: fixed compile with -no-widgetsRohan McGovern2012-07-272-2/+10
| | | | | | | | Disable a few examples depending on widgets which had previously been missed. Change-Id: Ic9c7cda94f690ee9d541c742997b7db9ace40fe0 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Implement implicit constructors for built-in classes.Stephen Kelly2012-07-277-0/+266
| | | | | | Change-Id: I6b0b104bc1da3252d014615c50b81830de42e722 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Describe an example usage of stretch in QSizePolicy documentation.Mitch Curtis2012-07-271-0/+11
| | | | | | | | | | | Martin Pejcoch suggested QSizePolicy's setVerticalStretch and setHorizontalStretch functions be better documented. This change gives sample usages. Task-number: QTBUG-18373 Change-Id: I54da8605f5e9e5f405c145b78865402baf78eee7 Reviewed-by: Martin Pejcoch <martin.pejcoch@nokia.com> Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Add QCocoaAutoReleasePool to QCocoaMenu::setTextMorten Johan Sorvig2012-07-271-0/+1
| | | | | Change-Id: Ia47d79d400c6c4dcd7a49595f05ddafb5a256fad Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fix QMimeDatabase qdoc errorsJeremy Katz2012-07-271-2/+28
| | | | | | | | Some of the \sa lines were missing () after function names. Document MatchMode and the deprecated mimeTypeForNameAndData() Change-Id: I468b9741908beb7be5723a8bb927e5418fc1c344 Reviewed-by: David Faure <faure@kde.org>
* QtNetwork: unbreak QT_NO_SSL buildMarc Mutz2012-07-262-10/+8
| | | | | | | | | | | The Q_DECLARE_METATYPE()s were outside of #ifndef QT_NO_SSL for classes that are defined inside. Expand the #ifndef block. Change-Id: I45b73a24032fb2a79fd80d91282b782daa8a8f68 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fix several QUrl qdoc errorsJeremy Katz2012-07-262-7/+27
| | | | | Change-Id: I2b89751ed2ec54f3b992c5fc4b39539d521c3404 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix position of mouse events generated from touch events.Andrew den Exter2012-07-262-1/+11
| | | | | | | | | | | In touch event terminology the global position is the screenPos, scenePos is the windowPos. Fixes a tst_qdeclarativepincharea test failure in qtquick1. Change-Id: Ie98fe12be8cbedc9b019913b066e7c4bce75278d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Fix MSVC 64bit warnings about truncation from size_t to int.Friedemann Kleint2012-07-261-2/+2
| | | | | | Change-Id: I9aea91aeb9f71817e9cc612d41351dbc98056500 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Stabilize tst_QMenu::tearOff().Friedemann Kleint2012-07-261-3/+1
| | | | | | | Introduce QTRY_VERIFY for frequently failing test. Change-Id: I38a6420574c4dde20fd7fa484681514543bd70cb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Stabilize tst_QCompleter::QTBUG_14292_filesystem.Friedemann Kleint2012-07-261-4/+92
| | | | | | | | Make sure the test subdirectories are actually visible in the file model before the tests start. Change-Id: If640456bba4362b19d7ad9d9184736c2eb8d3bde Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Base 'FileSystem' test helper class on QTemporaryDir.Friedemann Kleint2012-07-264-70/+70
| | | | | | | | | This avoids test instabilities and prevents test directories from being cluttered with temporary files. Change tests accordingly. Remove unused createLink() method. Change-Id: I843c28ab81c8a476c71c5211a7479b22d3d9fc93 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* QMetaTypeId2::IsBuiltIn: (new) template meta-function to check for built-in ↵Marc Mutz2012-07-264-2/+41
| | | | | | | | | | | | | | | types This allows to check whether QMetaTypeId2::MetaType exists, and can help turn run-time into compile-time expressions, even without constexpr support, or in situations where constexpr can't be used (because you can't overload on it). This was designed for the QMetaType::registerConversion feature, but it's much more widely applicable. Change-Id: Iafa04add04bcb531b3f7fe3e751c7e91ee6a3bc0 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* QFileInfo: remove synchronisation macroMarc Mutz2012-07-261-1/+0
| | | | | | | | | Staged after all other modules have removed their Q_DECLARE_METATYPE(QFileInfo) copies. Change-Id: I9ac42fcc5f333dd6e8b92c8755610f88cb7267a0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fixup the plugin documentationLars Knoll2012-07-267-16/+497
| | | | | | | | | | Move the plugin howto from qtdoc to corelib where it belongs. Fix the snippets and remove all remaining references to Q_EXPORT_PLUGIN Task-number: QTBUG-26237 Change-Id: I43dce2ffa42193b7a992fa1a0f2fcb2f633037b2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc: Changed \qmlclass to \qmltype, added \instantiatesMartin Smith2012-07-267-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | The \qmlclass qdoc command is now deprecated. Use \qmltype instead. \qmlclass had two arguments, the QML type name and, if the QML type was elemental, the name of the C++ class that the QML element instantiates. The \qmltype command has only one argument, the QML type name. If the QML type is elemental, then the \qmltype command should be followed by a \instantiates context command in the same qdoc comment. e.g.: \qmltype Item \instantiates QDeclarativeItem When the developer does not include the \instantiates command for an elemental QML type, qdoc will no longer be able to detect that the C++ class name is missing, and qdoc will no longer be able to detect when the name specified for a \qmlproperty of the elemental QML type has the wrong name. Task nr: QTBUG-26648 Change-Id: Ia60872a35113a6f615bfc751ce1e9db6279dfb8e Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Revert "QDoc: Allow '0' to be used as 2nd arg for \qmlclass."Casper van Donderen2012-07-261-21/+11
| | | | | | | | | | This reverts commit 50dfd15dcc49d12c5335a37999aef041d7fdfaae. The change is not necessary anymore, since a new solution using \instantiates in in the works, having two ways to do exactly the same thing is not necessary. Change-Id: I6e139d760372fc6177023c470850418b2385fccd Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Fix some typos.Frederik Schwarzer2012-07-264-4/+4
| | | | | | | Change-Id: I3c3c96fbbc19e2a69ac2f22618f15f5262718e50 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QtNetwork: use nullary version of qRegisterMetaType<T>("T")Marc Mutz2012-07-2529-53/+42
| | | | | | | | | | | | | | | | | Using the nullary version has the advantage that multiple calls during a program run are much more efficient, since an inlined atomic is used to store the result. It also ensures that Q_DECLARE_METATYPE(T) has been used, whereas qRegisterMetaType<T>("T") will happily register anything. So I've added the macro where it was missing, or moved it to a central place when it existed hidden. In tst_qnetworkreply, this became a bit tricky, because a private header is conditionally included, so moved the Q_DECLARE_METATYPE() into a conditional section, too. Change-Id: I71484523e4277f4697b7d4b2ddc3505375162727 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Added note to QTransform::isRotatingAli Akhtarzada2012-07-251-0/+2
| | | | | | | | | | Rotation of 180 or 360 is treated as a scaling transform Task-number: QTCREATORBUG-7651 Change-Id: I44077de0a4a90a87d2d9e8499c1920da1ed066c9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Make the operator| for QUrl with QIncompatibleFlag constexpr.Stephen Kelly2012-07-251-1/+1
| | | | | | Change-Id: I7780af7ef0d5e191e2715c40bf0ffbb6d376f1a2 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix debug and release build for Windows CEAndreas Holzammer2012-07-252-2/+2
| | | | | Change-Id: Idc3faa2c65f3e87aadf75c0c79f1581a24aff8ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove usage of deprecated qWaitForWindowShown(QWidget *) method.Friedemann Kleint2012-07-2516-119/+107
| | | | | | | | Remove usages from autotests with the exception of widgets/kernel, widgets/widgets and widgets/graphicsview. Change-Id: I917b2857ed0cd07a6b3dbcd69244f558086c6586 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* tst_qmetatype: fix two more unused typedefs (GCC 4.8 warning)Marc Mutz2012-07-251-3/+1
| | | | | | | | | Also check the return value of DefaultValueFactory<QMetaType::Void>::create(), the same way it's done in testCreateHelper<QMetaType::Void>(). Change-Id: I3e6d7fca4ea74dbe65009f2eb2c64a1b3a370d68 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix copypasto: iconv -> cups.Stephen Kelly2012-07-251-1/+1
| | | | | | | Introduced in eba0efe10ea90dec7a8b1e95017b0203b899af95 Change-Id: I6bfbf884f66057955d62db6266cf11b399edf965 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* De-inline QItemEditorCreatorBase destructor.Stephen Kelly2012-07-252-1/+5
| | | | | | | | Virtual destructors on public exported API should not be inline. Change-Id: I05bff0412ac97d2d8bd3cf8944f4fff2cb619f54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove Qt5 to-do remarkGatis Paeglis2012-07-251-1/+1
| | | | | | | | | Removing Qt5 to-do remark since GraphicsView is considered done and this change is not performance critical. Task-number: QTBUG-25089 Change-Id: Ib6e59290a628d27d7e623d221e7100f2e11d13f9 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* fix syntax error in static plugin assembly codeOswald Buddenhagen2012-07-251-1/+1
| | | | | | Change-Id: Ib7662c5529432663df06eea509dc3479cea01050 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix syntax error in breakpad supportOswald Buddenhagen2012-07-251-1/+1
| | | | | | Change-Id: I7964615814377ae4fd9c7da897978100c9294835 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QObject: add a macro for conveniently setting the object nameMarc Mutz2012-07-253-8/+27
| | | | | | | | | | | | | | | | | | This is a simplified port of KDTools' KDAB_SET_OBJECT_NAME. It simply assigns the variable name as the objectName of a QObject, uic-style. It uses a small helper function so that it works on references as well as pointer variables. QLabel label; QLabel *pLabel = new QLabel(); Q_SET_OBJECT_NAME(label); Q_SET_OBJECT_NAME(pLabel); Change-Id: I25fec0c90f33249a3ea5d2dd622ab708019fd101 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Disable tty keyboard in kmsLaszlo Agocs2012-07-255-2/+150
| | | | | | | | Set QT_KMS_TTYKBD=1 to prevent this and keep vt switching, ctrl-c, input appearing on the tty, etc. working. Change-Id: I0071685205ae9e02536dcb71f6fef6495c48f8fb Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix keyboard input in kmsLaszlo Agocs2012-07-251-1/+3
| | | | | | | The window was not made active. Change-Id: I20c323201be71fa4deb758e4a8fc32297d6faf0c Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Update only dirty areas in kms backingstoreLaszlo Agocs2012-07-252-3/+36
| | | | | | | | | | Do not upload the entire (typically fullscreen) image all the time. Taken from eglfs' backingstore implementation. Change-Id: I53db5cf54577ebea715d6cbd7215b9d2154e8960 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Create IMPORTED CMake targets for executables.Stephen Kelly2012-07-256-21/+80
| | | | | | | | | | | Although IMPORTED executables are not extra special, this is more future-proof in terms of both future CMake features and future our needs - it is possible that we would want to add a property to an executable at TARGET scope, which would not be possible if it is just a path. Change-Id: I649c601e004b21603c5fa97de0b7c397813ed68d Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QDoc: Introduce a setting to include index nodes in QHP.Casper van Donderen2012-07-252-1/+3
| | | | | Change-Id: I5d35961241300f509b8a9d8e3cf980fabc10cfab Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Correct status tips for Menus example.Mitch Curtis2012-07-251-1/+1
| | | | | | | | | | Line spacing's status tip is incorrectly set to paragraph spacing's, and paragraph spacing's status tip is not set at all. Task-number: QTBUG-22736 Change-Id: I2c3ff2fa45221f1cf4af8e4323c383c998adb650 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
* Add ISO 8601 specification link to corelib's external-resources file.Mitch Curtis2012-07-251-0/+5
| | | | | | | | Used by qtbase and qtpim, but only needs to be in qtbase. Change-Id: I284a8b00ff8eced81057b636ead2b6107eb1fa0c Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QtWidgets: use nullary version of qRegisterMetaType<T>("T")Marc Mutz2012-07-253-2/+5
| | | | | | | | | | | | | | | | | | | Using qRegisterMetaType<T>() has the advantage that multiple calls during a program run are much more efficient, since an inlined atomic is used to store the result. It also ensures that Q_DECLARE_METATYPE(T) has been used, whereas qRegisterMetaType<T>("T") will happily register anything. Had to add Q_DECLARE_METATYPE to QFileInfo, for QList<QPair<QString,QFileInfo>> of QFileSystemModel to work with the partial specialisations of Q_DECLARE_METATYPE for QList, QPair. In order to synchronize this change with other modules that did their own Q_DECLARE_METATYPE(QFileInfo), a sync macro is defined that can be tested in other modules, and will later be removed again. Change-Id: I3004664e07e64cd885d5a03a57ff4e4379804aec Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add QSignalSpy::wait() method.David Faure2012-07-255-5/+85
| | | | | | Change-Id: I1f3b49e3dee19bf0b1d2933c6e6ad7972186e0d0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix qmake hash function to use XORRafael Roquetto2012-07-252-3/+3
| | | | | | | | | Use XOR instead of OR in order to avoid saturating all bits when computing the hash value. Change-Id: I50b1a044eb827239dae1c04732ca6a065f6233b4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Deprecate the qWaitForWindowShown(QWindow *) method.Friedemann Kleint2012-07-257-44/+43
| | | | | | | | | | | | | | While the qWaitForWindowShown(QWidget *) is inherited from Qt 4.8, the qWaitForWindowShown(QWindow *) was introduced in Qt 5. As it is identical to qWaitForWindowExposed() and removed already, it can be deprecated in Qt 5. Remove its usages in qtbase. Change-Id: I28788d120ad687a49f02b2b44de6b38a2832fe5c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* qdoc: Fixed incorrect href attribute values in qdocMartin Smith2012-07-2511-105/+99
| | | | | | | | | | | | There were two fileBase() functions, but only one was correct. The wrong one was being called in some cases. Now there is only one fileBase() function, which is always called. Task nr: QTBUG-26591 Change-Id: I2c40e2152a8c7ad1bb9db256ecf1367148f0e7f6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix typo in QMdiArea docsAli Akhtarzada2012-07-251-1/+1
| | | | | | Task-number: QTBUG-26498 Change-Id: I2c7b7a67c732eb58f1ffc2a137a675ac63dc6597 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Document emission of commitDataRequest() signal in QApplication doc.Mitch Curtis2012-07-251-0/+4
| | | | | | | | | | It is currently not clear that QApplication::commitData() emits the commitDataRequest() signal. Users should know this if they plan to override the default implementation. Task-number: QTBUG-23117 Change-Id: I418af4b83795d53c9d86a2ac620c0f7c5bb9ada3 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Correct reference to nonexistent Qt::QA_Window flag in documenation.Mitch Curtis2012-07-251-4/+4
| | | | | | | | Should be Qt::Window. Task-number: QTBUG-22725 Change-Id: I150e77dec9c93035e01cf2e6be68a54bb4b122b2 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>