summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* QtConcurrentFilter: remove unused typedef (GCC 4.8 warning)Marc Mutz2012-07-241-1/+0
| | | | | | | | This one actually triggers a failure in tst_headersclean. Change-Id: Id37184bacf910702879fa68014705ed5399cea1b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove winEventFilter, replaced with installNativeEventFilter.David Faure2012-07-247-63/+8
| | | | | | | | | No reason to keep a virtual method for Windows when all other similar methods (macEvent and x11Event) have been removed, and when installNativeEventFilter provides a much nicer solution (no need to derive from QApplication). Change-Id: Ia2a7960e320fcbd04cef91f467900861dbb377c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove usage of deprecated qWaitForWindowShown in dialog tests.Friedemann Kleint2012-07-245-32/+34
| | | | | Change-Id: Id3ebe202d65ee682e8e2e3ae107808e9abb6cc15 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Correct QDomDocument documentation re deletion of internal objects.Mitch Curtis2012-07-231-1/+1
| | | | | | Task-number: QTBUG-25641 Change-Id: If1f46757d2d1e678e4b9e939da89a497da71dccf Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix q_check_ptr typo in QtGlobal documentation.Mitch Curtis2012-07-231-1/+1
| | | | | | Task-number: QTBUG-24093 Change-Id: Ia6b4ef49e07910ceddd826b3b7cc81ca41f33d01 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Replace Q_REGISTER_METATYPE in QAbstractSocket::stateChanged doc.Mitch Curtis2012-07-231-1/+1
| | | | | | | | Should be Q_DECLARE_METATYPE. Task-number: QTBUG-24692 Change-Id: I9c8b8d503fba254661e8f0d72855758d5d03ada1 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Correct QLineEdit::inputMask documentation.Mitch Curtis2012-07-231-2/+1
| | | | | | | | | | | | | | | The documentation says: "Unset the mask and return to normal QLineEdit operation by passing an empty string ("") or just calling setInputMask() with no arguments." However, the parameter for setInputMask is a const QString&, so calling it with no arguments will result in a compile error. The documentation should not advise calling setInputMask() without arguments. Change-Id: Icd8e063dcd3d745bd4bf0c6851a38f63481957ae Task-number: QTBUG-24803 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* More qHash(T, uint) supportGiuseppe D'Angelo2012-07-236-53/+94
| | | | | | | | Add the seed to QPair, QUuid, QPersistentModelIndex's qHash(), and fix qHash documentation for them and for many other datatypes. Change-Id: I1386f3ed42ee1a832371a242ee5c82895ba92c2b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move the windows locale codec into it's own fileLars Knoll2012-07-234-217/+330
| | | | | | | | | Simple cleanup, that will make it easier to refactor the code to use ICU. Change-Id: I7486f36d27b8c521cf970327eb94b2236338d4ec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Add basic backingstore implementation to kmsLaszlo Agocs2012-07-232-4/+130
| | | | | | | | | | | | | | This allows using the kms plugin in QWidget apps having a single (preferably fullscreen) top-level widget. Based on eglfs' implementation. Dirty rectangle tracking is missing, should be added later. There is no composition so multiple TLWs will not work nicely. Change-Id: Ia78589d1a375925ebdcc46aa20fc1619ec14d6cc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com>
* Clarify ambiguous sentence in QVariant::toBool() documentation.Mitch Curtis2012-07-231-2/+2
| | | | | | Task-number: QTBUG-26482 Change-Id: Id9158ba1f7ffa5af169f808aed4559f7a0470e20 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* If the GL driver is singlebuffered, reflect that in QSurfaceFormatJan-Arve Saether2012-07-231-2/+1
| | | | | Change-Id: Iafed64d0a35f8d49357f147c8b7b4c0e9f4b9173 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* If swapBehavior is TripleBuffer, set WGL_DOUBLE_BUFFER_ARB to TRUEJan-Arve Saether2012-07-231-1/+1
| | | | | | | | | | Previously, if the drivers' swap behaviour was single-buffered it would fallthrough (just like DefaultSwapBehavior) and remain single-buffered. Change-Id: I4b93ad7a49094aa992d0b8fb3429c163bbbf655d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* WindowSystemInterface::sendWindowSystemEvents(): Remove unused parameter.Friedemann Kleint2012-07-2310-51/+20
| | | | | | | | No need to pass the dispatcher. Get rid of Windows logic to maintain a stack of dispatcher associated with flags. Change-Id: Ic2daad4b6762a46fac3274937effc188af436c9a Reviewed-by: David Faure <faure@kde.org>
* Improve the loading performance of QLibrarySean Harmer2012-07-233-33/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If an absolute path is specified we try that first. Otherwise we first try the most likely system-specific format (e.g. libfoo.so) on Unix. This improves performance especially on systems with slow flash devices. For example, prior to this commit loading the Xcursor library (in the xcb plugin) results in attempts to dlopen: "Xcursor" "Xcursor.so.1" "libXcursor" "libXcursor.so.1" With this commit this is reduced to a single attempt of: "libXcursor.so.1" Plugin loading uses absolute paths with QLibrary so there is no performance penalty for plugins with this commit. This is however a behavioural change with respect to Qt4 but one that I believe is justified and wanted. Change-Id: I7813afa335f9bf515e87934c2f8f97888818c69c Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* XCB: Record the OpenGL profile in the formatSean Harmer2012-07-231-0/+1
| | | | | Change-Id: I68f9e78e15fc798ec801feed74e0cb900ef577ae Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QNX: Use new native event filtering apiSean Harmer2012-07-232-1/+4
| | | | | | Change-Id: Iaf25697e6250ad29085647db4b8e50e274599227 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: David Faure <faure@kde.org>
* Quote the SONAME properly.Stephen Kelly2012-07-231-1/+1
| | | | | | | | It does not make a big difference, but it is what was intended initially. Change-Id: Idd7e06c857533030b000726ff87b48bb2619df06 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QPaintBuffer: use the nullary version of qRegisterMetaTypeStreamOperators()Marc Mutz2012-07-231-4/+2
| | | | | | | | | The name is taken from the existing Q_DECLARE_METATYPE()s. Also don't call qRegisterMetaType<>, as that is done within qRegisterMetaTypeStreamOperators<> already. Change-Id: Ia782868b49bc97d78e0cec29ef9f8b5709420e2a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QStyleFactory: remove unused typedef (GCC 4.8 warning)Marc Mutz2012-07-231-1/+0
| | | | | | Change-Id: I50ef91f4df3cdf1ae039dce269e37185eece6b8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Split QWidgetsVariant tests into a separate testcase.Stephen Kelly2012-07-238-218/+514
| | | | | | | This allows building the QVariant tests without the QtWidgets module. Change-Id: I7cd7e78a60c7bc7614ec16df1abe1e93e45d4923 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Create CMake files conditionally on the internal_module CONFIG option.Stephen Kelly2012-07-232-8/+2
| | | | | | | | | This includes a revert of 195df6e8e0ffb2636cfe395f560eb73c05a54b61 so that the solution scales better to other Qt modules, and other logic related to 'internal' modules. Change-Id: Ie4c1f10d20953aeb15438273081a810ab8bc9ec9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QTBUG-26296, dock widget movingJames Turner2012-07-236-11/+156
| | | | | | | | | | | | | | | Cocoa lacked implementation of FrameStrut events, and also frameMargins on QPlatformWindow. Fix both of these issues. Unfortunately QDockWidget also contains a tangle of #ifdef MAC behaviour which I am unclear about. What's included here disables some logic on Mac that seems definitely wrong - while moving a window on Mac we now generate NonClientArea events (as intended, I believe), but this should not cause dock-widget dragging to end. Note the window titlebar is the only frame-strut/non-client area on Mac (as far as I can see) Task-number: QTBUG-26296 Change-Id: Id0c6e954db64b9f9f71d16355cb92922877e5ebe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>