summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* QXcbWindow::setMask(): Check for SHAPE extensionUli Schlachter2012-07-251-0/+2
| | | | | | | | | | | If the SHAPE extension is not available and we try to use it, the xcb connection will shut down and go into an error state. This is bad because there would be no error message that would give a hint on what went wrong. Change-Id: I1a6734bd146ca179a990b6ce896813bf76007b66 Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Reimplement QXcbWindow::setMask() with xcbUli Schlachter2012-07-253-39/+19
| | | | | | | | | This functionality does not need libXext. The bindings for the shape extension from libxcb-shape is enough and is available without Xlib. Change-Id: I9f1927024c64df00ace1666998c6c6deda2ef782 Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix error in sample code on the Layout Management page.Mitch Curtis2012-07-251-2/+2
| | | | | | | | | | Incorrect return type in a sample class (CardLayout) function. Although the function is never called, the return type should be int, not QLayoutItem*. Task-number: QTBUG-25602 Change-Id: I05ebd07a35b6db62b8c12255186f9d9487da79f6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Remove references to nonexistent QLocale::setDefaultLocale() in docs.Mitch Curtis2012-07-252-2/+2
| | | | | | | | | Should be QLocale::setDefault(). Task-number: QTBUG-23210 Change-Id: I0f5e6cc431f568c9b8c4be1411b7b47835304d0b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* QtOpenGL: use nullary version of qRegisterMetaType<T>("T")Marc Mutz2012-07-251-1/+5
| | | | | | | | | | | 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. For this, it requires Q_DECLARE_METATYPE(T), so add, too. Change-Id: Ic9a9013aa13ff9d8f917f9df033dd2197944f84a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Split the QGuiVariant test from the Core one.Stephen Kelly2012-07-2554-402/+667
| | | | | | | | | | | This makes development on the meta type system easier because only QtCore must be re-built to run most of the tests. The existing QGuiVariant test needs to be run before pushing anyway, but not so frequently. Change-Id: I1fa66edbd790c957e1a232226847dd550227a477 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Make sure that unknown types use the handler for unknown types.Stephen Kelly2012-07-251-2/+2
| | | | | | | | | This fixes an assert in the QVariant checkDataStream unit test when it no longer links to QtGui. Change-Id: Ib45139cf790f3ac6ee80e1c59f50d08d0b51ffa4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Use a large core type for the QVariant::setValue test.Stephen Kelly2012-07-251-2/+4
| | | | | | | | | The type needs to be large enough that QVariantIntegrator<T>::CanUseInternalSpace is true. Change-Id: I311c44bedfebd946e41639975df206c27b6d55ca Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Make qRegisterMetaType constexpr for built-in types.Stephen Kelly2012-07-252-1/+31
| | | | | | | | For consistency with qMetaTypeId, and because we can. Change-Id: I6882a16ef3c0d84539048c9f2c201c4a2b2ca7ad Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Don't make the CMake file generation dependent on DESTDIR.Stephen Kelly2012-07-251-1/+1
| | | | | | | | | It is expected to be well defined for the CMake files to be generated correctly, but if that stops being the case, it should fail loudly. All of the generated CMake packages are CI tested. Change-Id: I67c7fa6ef1fe0a019c40936cb12db282669e9ee8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Remove mouse events synthetized from touch eventsKevin Ottens2012-07-241-17/+0
| | | | | | | | | This behavior is now implemented in a finer way in QtQuick and QtWidgets, it's not needed anymore in the platform plugin. Change-Id: Iacdcd313253627fbba094abe4e9a9c1d23a431e1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* QtDBus: use qMetaTypeId<T>() instead of qRegisterMetaType<T>("T")Marc Mutz2012-07-245-10/+25
| | | | | | | | | | | | | | | | | | | | | | Using qMetaTypeId<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> (the unary version) will happily register anything. Had to add a proper default constructor to QDBusError, as the one doubling as the default constructor wasn't available under QT_BOOTSTRAP, but Q_DECLARE_METATYPE requires a default ctor. Also changed a nullary qRegisterMetaType() to qMetaTypeId() in qDBusRegisterMetaType(). They're equivalent, since the former just calls the latter, but apart from the miniscule optimisation that the compiler has to instantiate one function less, the result is also used, so using qMetaTypeId() better expresses what 'id' is. Change-Id: Ib9dde17923ab9ee55f9464138a625ab8cd55c482 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QAbstractNativeEventFilter: document return valueDavid Faure2012-07-241-0/+4
| | | | | | | | | (paragraph taken "as is" from the QObject::eventFilter documentation) Change-Id: I1b7e92736103042d7105f1b26ba4784cbcc43dc2 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* remove support for rvct_linker config from MinGW generator againOswald Buddenhagen2012-07-241-11/+3
| | | | | | | | | yet another symbian remnant (building windows arm executables for the simulator). This reverts commit 5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1. Change-Id: I6eb147c0e2710eba09a4339fa4a08a5b08f8dab3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* $$QMAKE_LIBDIR contents belong into $(LIBS), not $(LFLAGS)Oswald Buddenhagen2012-07-241-3/+3
| | | | | | | | unlike for the unix linker, this does not matter for the windows linker, but keeping it consistent has advantages. Change-Id: Ib9b9efa18c31d87c026d3cac5a8737f4612ad1c0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* do not run findLibraries() over QMAKE_LFLAGSOswald Buddenhagen2012-07-241-2/+2
| | | | | | | | libraries and related flags have no business in that variable, by definition. Change-Id: Ic958a3e082a498945ab56bc12ec05d4083ee43a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* dispose of MSVCPROJ_LIBSOswald Buddenhagen2012-07-247-39/+15
| | | | | | | | | | | | | | | this way QMAKE_LIBS{,_PRIVATE} can be treated the same as in all other generators, which allows us to: - make the windows generators' findLibraries() be more like the unix version - dispose of QMAKE_INTERNAL_PRL_LIBS handling while reading prl files (because the output always goes to QMAKE_LIBS) - as a side effect, QMAKE_LIBS_PRIVATE are not subjected to prl file resolution any more, which is again consistent with unix - the correctness of that needs to be assessed separately. Change-Id: Ie9bc04d117eff6a7cde846677f98acf3c64aa6ee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* remove apparently pointless call to findLibraries()Oswald Buddenhagen2012-07-241-1/+0
| | | | | | | | | | | the function was already called long before. if it really needs to be called again, it's a) probably affecting the other windows generators as well and b) the actual problem should be fixed instead. This reverts commit d50c3c6624b2343e42d0df4b72212d9ced8f3682. Change-Id: Iaa2007640fbc9acdc50ba3b0681efeb0d184f224 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove obsolete or commented use of Q_DECLARE_METATYPE.Stephen Kelly2012-07-249-26/+0
| | | | | Change-Id: I15bc845801b9f84a9252a0092fbd69f0e1b3f4ea Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove obsolete TODO.Stephen Kelly2012-07-241-1/+0
| | | | | | | This will probably not be done in time for Qt 4.7. Change-Id: Ie9112cee021e31849f5b43eefb8eb57537d01a2d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Propagate synthesized mouse events in parallel (lock-step) with touchKevin Ottens2012-07-244-13/+264
| | | | | | | | | | | | | | | | | | | | This patch implement the equivalent of 468626e99a90d6ac21cb311cde05c658ccb3b781 in qtdeclarative but for QtWidgets. If a widget doesn't accept a touch event, then QApplication gives it another try by synthesizing a corresponding mouse event. This way QtQuick and QtWidget behave in a similar way, removing the need for platform backends to try to emulate a mouse event from a touch event unconditionally. Also add relevant unit tests and adjust old QApplication ones. Change-Id: Iddbf6d756c4b52931a9d1c314b50d7a31dbcdee9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Replace old typedefs with their built-in equivalents.Stephen Kelly2012-07-241-4/+2
| | | | | Change-Id: I3ecb75ace431b92a13de67aa6426cf570398587f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix typo pallete -> palette.Stephen Kelly2012-07-241-2/+2
| | | | | Change-Id: I17b71bfed22c3692b027556ef2e5d6ece4f3f77e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractItemView: don't qRegisterMetaType<QModelIndex>Marc Mutz2012-07-244-23/+0
| | | | | | | | | | QModelIndex is a build-in type nowadays and doesn't need to be registered anymore. Also remove them from the tests. Change-Id: I47029972651c045c880cee86fb292116a29493d5 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add tests of the various testlib definition possibilities.Stephen Kelly2012-07-248-0/+206
| | | | | | | | | | | The behavior of QTEST_MAIN depends on whether QT_GUI_LIB or QT_WIDGETS_LIB is defined. It could create a QGuiApplication or QApplication which could cause linking issues if the corresponding library is not linked to. The failure cases are also tested. Change-Id: I61ed0bc760564ef42ce1dbd86c83c06348c860ff Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove the unnecessary qdebug.h includes in the QPoint(F) testsLaszlo Papp2012-07-242-2/+0
| | | | | Change-Id: I5c45af9d498e20b46d6faf8c96de87586eca7b4a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Provide access to (dis)connectNotify() from other objects.Thomas McGuire2012-07-241-0/+15
| | | | | | | | | This is the first step to fix (dis)connectNotify() not getting called for QML signal handlers and bindings. Change-Id: I5cfc126a5562a20031d3af8415c60d101603dd8d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>