summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-19143-1873/+6233
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07
| | * \ \ \ Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-1696-692/+946
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: If2168c519daf45390af04af9ef9722770453a493
| | * | | | | doc: Add a bunch of missing dependsTor Arne Vestbø2012-10-169-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32c3730f8181d73a7c8e36ef382c74b8da754269
| | * | | | | qdoc: qdoc now can run in 2 passesMartin Smith2012-10-125-26/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two command line options have been added, -prepare and -generate. If you run qdoc with -prepare, qdoc reads and parses the source files but does not generate the documentation. It only creates the .index file for the module you are running qdoc on. If you run qdoc with -generate, qdoc reads and parses the source files as well as the .index files created by running qdoc with -prepare, and it generates the documentation but no .index file. If you run without either option, qdoc runs as before, i.e. it runs both passes as a single pass. Task number: QTBUG-27539 Change-Id: Idbfe3f0f9dff58283596b504f00dff3f70f6e371 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | | | | qdoc: Allow empty character literal ''Martin Smith2012-10-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc's tokenizer was reporting an error for the empty character literal ''. Now it allows it. Apparently it makes sense in .js files. Task number: QTBUG-25775 Change-Id: If407427fad9b65a035c2c4785d53c9e3d5202e62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | | | | doc: Fix a few doc errors for QtSQLTor Arne Vestbø2012-10-126-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The examples include path already contains 'sql', so we can't prefix the includes with 'sql' as well. Changing the include path to also include the parent examples directory is not an option, as qdoc will then try to generate output for example single example. Change-Id: Ifae07af86e60e6105a0625f29fbd6bc8f73b2550 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | | | | doc: add missing dep from qtcore to qtguiTor Arne Vestbø2012-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7cf8236b376376a320e2de5ca65d2cd7da91c2f Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | | | QMimeDatabase: remove deprecated APIDavid Faure2012-11-201-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c241d8921ea6384c30a1731a036aec8edc7609ab renamed the methods but kept the old ones "for a week or two" at Thiago's request. Change-Id: I0747c032b549e45f6c8201db577d84863f39f599 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | | | | | Use setImage workaround on all OS X versions.Morten Johan Sørvig2012-11-201-6/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The painting bug that we are working around/fixing here has been observed on 10.7 as well. Change-Id: Ic29421bcc84405afa085af2f0ed2bc554c684f98 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | | | | SQL: Fix OCI driver's compile errors.Caroline Chao2012-11-202-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-27979 Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | | | | Fixed memory leak in assign operator of QGLBufferVadim Zakondyrin2012-11-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb51dd5a567483b415ab0e8af9eb62221225890d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | Fixed memory leak in assign operator of QOpenGLBufferVadim Zakondyrin2012-11-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I47f9128b54770bae7a63f82bf66ca16144b67c55 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | QLocale: replace hard-coded default country-for-language mapKonstantin Ritt2012-11-191-283/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...with a generated one in a way similar to what http://www.unicode.org/reports/tr35/#Likely_Subtags suggests. The supplemental/likelySubtags.xml contains all the required data. This changes some default countries to a most-expected ones. Change-Id: I920a5623601d8661a943e78197d3bcc838191483 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | Document what the QMimeDatabase constructor really does.David Faure2012-11-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d4dcc92296163dea7b78fbb0ceefaee08e57a94 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Allan Sandfeld Jensen <kde@carewolf.com>
* | | | | | QSystemTrayIcon/X11: Use display obtained as native screen resource.Friedemann Kleint2012-11-193-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the screen name was used, which contained the display name. This was changed to return the xrandr-name. Task-number: QTBUG-5416 Change-Id: I560143d6d459a8051c9640079cf7d39a3caebfec Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | | | Add QPlatformNativeInterface::nativeResourceForScreen().Friedemann Kleint2012-11-192-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5416 Change-Id: Ic163a5ff1c7a06869d324acb9aa7c257a0262e72 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | | | Add a new location for QML 2.x importsThiago Macieira2012-11-192-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds a -qmldir configuration option for the configures to allow the user to change the default location (it defaults to $archdatadir/qml). It adds a QLibraryInfo::Qml2ImportsPath value for QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf configure location entry "Qml2Imports". At the same time, it makes the qmake .prf files dealing with QML plugins be the QML 2 version. Those files are new in Qt 5, so we have the option to choose which version we want to use. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | | | Compile with -no-widgets.Morten Johan Sorvig2012-11-194-49/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove QApplication usage in qcocoasystemtrayicon.mm Move qt_mac_cg_context from qpaintengine_mac.mm to qcocoahelpers.mm to make it available in no-widgets builds. (Move qt_mac_colorSpaceForDeviceType as well; color space support needs to be cleaned up later on.) Change-Id: I724fdb09538d65eae56c26165f3ba53b6814ea78 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | | | | | Fix error reporting in TDS SQL driver.Aaron McCarthy2012-11-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error and message handlers used by the freetds library were getting reset to back to the default every time a database was opened. The Qt TDS SQL driver was calling dbinit() from QTDSDriver::open(). This had two problems: 1. dbinit() would reset the error handler previously set by a call to dberrhandle(). A db error would then cause the application to abort. 2. freetds expects dbinit() and dbexit() to be called symmetrically. Opening multiple database connections would result in freetds not cleaning up on application close. Solved by moving the dbinit() call into the QTDSDriver constructor. Change-Id: I59018d83238672c903b96a4d7f3f21b664c3ff4c Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | | | | Fix msvc2010 compiler warnings of switch with default but no case labelsThiago A. Correa2012-11-188-32/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5de4d7405131314c4e2bdb1222d2bb1a2d34a993 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | | | | fix namespaced buildOswald Buddenhagen2012-11-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ac3f3dc2057914108876241883cf8c7e30d2c33 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | | | make qt_tool support building bootstrapped toolsOswald Buddenhagen2012-11-167-41/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a "side effect", this fixes the build of bootstrapped tools when doing a debug build under msvc: qt.prf would add CONFIG+=release after default_post.prf already loaded debug.prf. Change-Id: Idd17cf28d358950fd90bb18ca7a8d67e06953bc1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | | | remove pointless TARGET assignmentsOswald Buddenhagen2012-11-166-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET defaults to the project file's basename Change-Id: I0cd204ae6559e6c51d3c987bc38ae372e2b4a3dd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | | | MinGW: Add missing constants for float control.Friedemann Kleint2012-11-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibce64ed1ec2809551b0cd334b53b33ed445f90f7 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | Accept subsequent drag moves in QWidgetWindow if enter was accepted.Friedemann Kleint2012-11-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handling similar to QGuiApplicationPrivate::processDrag. Task-number: QTBUG-28008 Change-Id: I516531da242471cdfbb59418d0052b25f799f373 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | | | Remove qSort from QCollator docsGiuseppe D'Angelo2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4523b7e4cd2a7f9e07a39e48e8024ceb0d7eb839 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | | | | Remove qSort from QList/QSet docsGiuseppe D'Angelo2012-11-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82ac7cafbda3bb6d54a0ba26903ab11113640067 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | | | | Fix QMutex::tryLock timeout computation on LinuxOlivier Goffart2012-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout is in millisecond. So we just need to divide by 1000 to get the number of seconds Regression introduced in f587e8f4fd670f11fa1e878c1015d7241033559a Reported in the comments of QTBUG-24795 Change-Id: Id16e05e7d04d33605860926f7516d14cdefd6a36 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | | Fix incorrect size hint for abstract spinboxJens Bache-Wiig2012-11-151-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This size hint was based on strange logic from an alternate universe. The size hint should only contain the text size and let the style add what is neccessary for the frame rect etc. Most styles have worked around this by simply ignoring it, however some styles could still break a bit. Note that we add 4 since that is the constant that the old code 'usually' ended up at and should be compatible with our existing styles. Change-Id: Iebdbcb8949dd8b7daa7d8cb96ae5ab7351e4f79d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | | | | | Missing break in case QEvent::WindowStateChange.Miikka Heikkinen2012-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The missing break causes state change event handling to fall through to tablet event handling, which is clearly wrong. Change-Id: If19d7b3f794b3614961b9e79952331b0ede1fba1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | | | Disable static contents optimization for now.Samuel Rødal2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since none of the platform backingstore implementations currently implement this, skip trying to use the optimization for now to avoid graphical glitches. Task-number: QTBUG-27971 Change-Id: Ic6d263bb552ef0b4786910d71f965d26d810b7eb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | | | | | Add feature to enable rounded line edit on macJens Bache-Wiig2012-11-153-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will not currently be exposed in the widget API but we can make use of it for qt quick components. Change-Id: I08300a3bcd58e68df633fe9b36a988eb6176ef9c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | | | | Improve highligted colorization on mac with Fusion styleJens Bache-Wiig2012-11-152-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mimics the platform behavior of using blue color when the system palette is in use. Change-Id: I9ad6a552614a3466a930ad5b28fc70d9343d2022 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | | | | Accessibility: Add documentationFrederik Gladhorn2012-11-151-10/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keeps the docs as internal, but add information about the events. Change-Id: I9b961a946a6d799232a756a9ac874c0caf91ecbc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | | | Accessibility Mac: Implement value interfaceFrederik Gladhorn2012-11-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea6e3c69b220d35bddb1798ff991f8e67e1749e3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | | | | Implement EditableText accessibility for Mac.Morten Johan Sorvig2012-11-154-5/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe03975bafc5a6a420b3bd69dfaa93dbf65c9958 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | | Bring back -nograb/-dograb for debugging.Friedemann Kleint2012-11-153-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-27632 Change-Id: I4b59df01519af4684d9dbe6e4b6c18a5ebd9aeae Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | | | | | Fix QApplication::primaryScreen() in WindowsMiikka Heikkinen2012-11-151-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformInterface::screenAdded() documentation specifies that first added screen will be the primary screen, so we need to ensure that the screen Windows reports as the main display gets added first. Task-number: QTBUG-27988 Change-Id: Ibc17b05a6c37007ff749fb54ab62d47ffa40f8ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | | | Assign correct codes to QLocale::AnyCountry and AnyScriptKonstantin Ritt2012-11-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as their meaning, in fact, is unknown (or default) country/script. Change-Id: Id75a70d4b33c2092de414f3ac357f6bcb627ba47 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | Add a bunch of missed scriptsKonstantin Ritt2012-11-152-1/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I078bf95cb50c7ef634f9f3133ab9f9d25439e4ef Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | Add missing Bodo language introduced in CLDR 1.9.1Konstantin Ritt2012-11-152-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4feb6ba781299d65ff3bf2717f08a0ac7eae7928 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | Regression fix to QHeaderView::setDefaultSectionSizeThorbjørn Lund Martsum2012-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the sections has been resized we need to calculate new values for the section start-positions. Otherwise we break visualIndexAt and sectionPosition. This fixes a regression introduced in b800d8b94a7861ecf8853621f6556fca186fb5b7 Change-Id: I148dbf44f742208787ed59b70d82b8048d721e90 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | | | Windows: Fixed mouse events related to size gripsOliver Wolff2012-11-151-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code which was adapted from Qt4 seems not to work as expected on current Windows versions. There are no additional mouse move events after releasing the mouse button from the size grip. One special behaviour in regards to SizeGrips here seems to be that there is no WM_LBUTTONUP message but a WM_MOUSEMOVE received when the mouse button is released from the size grip. Due to mouse event handling in the Windows plugin that event triggers the desired mouse release event so everything should be fine. With the previous implementation the behaviour from the bug report can be explained by the fact, that the mouseMove event is eaten in qwindowsmousehandler and so the second mouse click isn't even delivered. Basically the first click triggers the press event without a release and the second click does not trigger a press but a release event. Task-number: QTBUG-27864 Change-Id: I987c6e01dec4a6b6189ed30959daf7a2fcc17df6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* | | | | | QHash: constify some QHashNode membersGiuseppe D'Angelo2012-11-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're read-only member variables (key, hash value of the key) set only in the ctors, or a "comparison" member function. All of them can be constified. Change-Id: Ifd9242577213f38439a4f998b678f5b05413ad21 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao@abecasis.name>
* | | | | | Change to enter/leave policy while grabbing.Miikka Heikkinen2012-11-154-44/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending enter and leave events to other windows than the grabbing window is not logical. The policy should be that only the grabbing window receives enter and leave events. Changed the documentation accordingly and provided the necessary changes to Windows implementation. Also removed explicit leave event generation for widgets when popup is opened as that is now redundant. tst_QWidget::underMouse() test was changed to behave according to new logic. Task-number: QTBUG-27871 Change-Id: I127fb8685b4a4206d1a319f42cba491ec02bc8ca Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | | | Add comment to resetCursorBlinkTimer to avoid accidental removal of itJan Arve Saether2012-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied4c686ab5f4d4530d4d5ae3ce22c6b9ffc4c1de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | | | Add resetCursorBlinkTimer() back again.Jan Arve Saether2012-11-152-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently it was used by QtQuick1 Change-Id: Ia0cf8535cbfed9b09e151b887c243fb173ca300a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | | | | Fix mouse cursor behavior for QMainWindow splittersMiikka Heikkinen2012-11-151-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cursor handling has changed in Qt5 somewhat, which made old cursor logic for splitters invalid, causing the splitter resize cursor to persist after hovering over splitter, as well as cursor flicker during splitter drag. Since the cursor is changed always in dispatchEnterLeave, CursorChange event can now come for QMainWindow when cursor hasn't actually changed, so we now check if the cursor is still our adjusted cursor before updating the old stored cursor. We also ensure that our adjusted cursor stays visible if cursor is in fact changed - the changed cursor will be shown when we no longer need adjusted cursor. Additionally, we skip cursor adjustments while we are dragging the splitter to avoid cursor flicker, which is caused by splitter actually moving asynchronously after the mouse event is handled. Task-number: QTBUG-27970 Change-Id: Id9f6a0e9653563e09b883f21396de056a88f78a7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | | | ANGLE: Invalidate client window area when resetting swap chainJonathan Liu2012-11-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resizing a window larger results in the newly exposed region being invalidated but the old region is treated as valid. This can result in the old region no longer updating. This has been observed on Windows 7 64-bit with Aero theme using NVIDIA GeForce GTS 250 and driver version 301.42. Invalidate the entire client window area when resetting the swap chain so that it updates properly. Upstream patch: https://codereview.appspot.com/6812076/ Task-number: QTBUG-27822 Change-Id: I0f5d2004576019458baee74c35e52f69b893a219 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | | | Windows: Fix autocapture for multiple buttonsMiikka Heikkinen2012-11-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic capture of mouse events on button press was released when the first button was released, even if multiple buttons were pressed. Changed it so that the capture is released when the last button is released. Task-number: QTBUG-28007 Change-Id: Icee59aacaf0ba947820c40cb7ede00193ff46a14 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>