summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add QPointF/QRectF scale functionswip/highdpiPaul Olav Tvete2015-07-011-7/+31
| | | | | Change-Id: I91c5afc061e91c6088398d039c1c1fd3d79254ca Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Clean up comments and dead codePaul Olav Tvete2015-07-014-53/+10
| | | | | Change-Id: Iadaca71328404bd6c526af5095b32e5e35548182 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Add application attribute to disable highDPI scalingPaul Olav Tvete2015-06-303-0/+14
| | | | | | | | | | Main use case is for KDE Plasma, which needs to know about real window system coordinates. Can also be used by applications that do all the scaling manually, and that do not want to have Qt scale the coordinate systems and painters. Change-Id: Ic595131c5e2fb4c0af95e9b5bd3e40beee86760b Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Add environment variable to set per-screen scalingPaul Olav Tvete2015-06-301-0/+38
| | | | | Change-Id: I0fce05998ba6092c4dd1d64790c56c0668383477 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Use proper line spacing for font testPaul Olav Tvete2015-06-301-3/+3
| | | | | | | Since we're making things look pretty :) Change-Id: Ibc2e5f7315b9ecf789b8c7cdbf100632b9a2b4c0 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Fixup screens display.Morten Johan Sørvig2015-06-291-3/+5
| | | | | | | | | | | Support cases where one or more screens have negative positions. Make the text size a (constant) fraction of the painted screen rectangle height. Change-Id: Iea39aa49281cfe2b97c3e9b2414ee5db6dfe1fbb Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Fonts manual test: print useful text.Morten Johan Sørvig2015-06-291-2/+2
| | | | | | | Mention if this is point or pixel sized text. Change-Id: I9996bca8370e2822a14e8090b64da2d21b40e98e Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Remove QPlatformScreen::screenGeometry()Paul Olav Tvete2015-06-292-17/+0
| | | | | | | | | | QScreen's geometry is always determined by the platform screen, since there is no Qt API to resize or move a screen. Therefore, it makes no sense for the platform screen to ask QScreen for the geometry. Change-Id: Iedaa40e06e3a878f4e4e13fddd13a67a62d1f0f9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Handle closeEvent() properlyPaul Olav Tvete2015-06-291-7/+29
| | | | | | | ...just because we can. Change-Id: I72fcb05711c3b5ecee250fdf0adfc0b8304590cb Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Show initial scale factorsPaul Olav Tvete2015-06-291-28/+52
| | | | | | | | | | Initialize the sliders to the currently active factors. ...and fix up the layout so the sliders align properly, and aren't squashed when resizing. Change-Id: I37ef853b0fd5a26939134da7116778f898f52a88 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Manual test for physical sizesPaul Olav Tvete2015-06-291-0/+131
| | | | | Change-Id: Ic312bff631380fa5b40b927b092eb17940026b94 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Scale logicalDpi when turning on screen scalingPaul Olav Tvete2015-06-184-6/+22
| | | | | | | | | | | | | Assume that the logical DPI for the primary screen is sane, and keep font sizes constant as screens are scaled. The global scale factor will act as a zoom level, and will cause all fonts to be bigger. Note that since we do not change logicalDpi after application startup, the manual test sliders will not match what happens with auto scaling. We may want to fix that... Change-Id: I5a3daa57c2dacf0158836492d31573723e49399a Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Only turn off font hinting when really scalingPaul Olav Tvete2015-06-184-19/+44
| | | | | | | | | | | | | | | | | | | We don't want to turn off font hinting based on whether auto-scaling is on, otherwise Qt Creator will look bad on a low-DPI screen. Instead, we turn it off only if we have at least one screen that is scaled. QHighDpiScaling::isActive() now means that there is actual scaling going on. There is currently no need for the old meaning, so this change does not include QHighDpiScaling::isEnabled(). Note that nothing can save us from the case where there is one high-DPI and one low-DPI screen. In that case we choose looking bad on the low-DPI screen instead of looking like crap on the high-DPI screen. Also note that our font system we doesn't allow us to change our minds on hinting later when screens are plugged in or removed. Change-Id: I14a4ec7a49f4ba74a4c74684c7b951d0a71b951d Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Make drag and drop work again after the mergePaul Olav Tvete2015-06-173-3/+13
| | | | | | | | QBasicDrag does not have enough information to map the coordinates, so we move that responsibility to the plugin. Change-Id: I6eb87014b3259844bb3373ecf961d92debdb2b84 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* dirty hack to make setScreenFactor workPaul Olav Tvete2015-06-171-0/+4
| | | | | | | | | This is a seriously dirty hack, but without this, screen geometries will be wrong when scale factors are changed after application startup. Change-Id: Ia39164303ef648ec3752d7f4b9db06477a2d3fb4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Add global scale option to manual testPaul Olav Tvete2015-06-171-29/+51
| | | | | | Change-Id: I24e019a4a960425028c982dcc94d82643c836003 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Update doc.Morten Johan Sørvig2015-06-162-25/+36
| | | | | | | | | | Move to the class documentation in the cpp file, focus on documenting the class and not necessarily high-dpi scaling in general. Change-Id: I4f04398904325b2f9061db8d3a82cd362276e977 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Windows: Fix compilation after f5bdd92e5d0217bf3eec13395e4baa95bd8fda37.Friedemann Kleint2015-06-121-2/+16
| | | | | | | | | Bring back static versions of the constrained scaling functions. To be squashed with dbe2dd295cce19680f8ba7a7cca65150701051e2 . Change-Id: Id05b8085ab56dd777ce1ab3b7da3ce47c01dcb00 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Add QPlatformWindow::windowClosestAcceptableGeometry().Friedemann Kleint2015-06-103-2/+17
| | | | | | | | | | Add a function to determine the closest acceptable geometry (height-for-width) to QPlatformWindow similar to the existing QPlatformWindow::windowMinimumSize(), windowMaximumSize()... Clean up the hack in the Windows platform plugin accordingly. Change-Id: I96e943cfdbafdd0ff444e0d53ee0bdf8603d33df Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Make testInputEvents not use QWindowSystemInterfaceMorten Johan Sørvig2015-06-091-5/+2
| | | | | | | | Use QTestLib instead, which will handle the QHighDpi coordinate scaling. Change-Id: Ib2ab9c6edfa6ffbf594ab6251c4b0b83f9581d6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Simplify tst_qwindow::positioning()Morten Johan Sørvig2015-06-091-2/+2
| | | | | | | | | | | | platformScreenForWindow() is currently implemented as: return window->screen()->handle(); Use window.screen() directly and avoid the QHighDpi conversion call. Change-Id: I0f6487efc4d1494813179665b21150f3ca7a8666 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Merge remote-tracking branch 'qt/dev' into dev-highdpiPaul Olav Tvete2015-06-09841-7038/+15167
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
| * Testlib: Export blacklist functionsCaroline Chao2015-06-081-3/+4
| | | | | | | | | | | | | | So they can be used in QtQuickTest. Change-Id: I64925feb243fb27234951276d81119bc1f6d5a56 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * itemsviews: Add 15 QList::reserve() callsSérgio Martins2015-06-085-11/+37
| | | | | | | | | | | | Change-Id: I4ed8872ecd560d51c00cb3d2b93e082c5abdd8dc Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * make the enums of QProcess known to the meta object systemJoerg Bornemann2015-06-081-0/+11
| | | | | | | | | | | | | | | | | | | | This enables users to construct enum values from strings and provides useful qDebug operators. Task-number: QTBUG-10777 Change-Id: Ia3592f00d559b980b4875ee8fb5e8ffb4328d464 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Export class QAccessible::ActivationObserver.Friedemann Kleint2015-06-081-1/+1
| | | | | | | | | | | | | | | | Change a21dfab54ed518266c42d3e87e02bd991de8486e de-inlined its destructor, so, the class needs to be exported. Change-Id: I32d21622a944a93718f549060e5e5f7e71fd2646 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix incorrect expression in directfb keyboard codeHolger Hans Peter Freyther2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | Add missing equal sign to have the result of the OR stored inside the modifiers variable. Fixes Coverity CID#89071. Change-Id: I0ee1a080f5f6757ae7646733aa3bb5cf8c6cdeed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Remove bogus call and comment from addressbookHolger Hans Peter Freyther2015-06-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | QMap::empty() does not empty the list but is the STL version to ask if the map is empty. Remove the comment and code as operator>> of QDataStream will clear the map. Fixes Coverity CID#89073 Change-Id: I259e518b44afd42b698368b42aedcc3b84240aca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Remove exec bits from files that should not be executableDmitry Shachnev2015-06-07106-0/+0
| | | | | | | | | | | | | | Change-Id: I66f49c6db82eadc3b11cc9b1cf01375e9596a8e6 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Fix WEC2013 build of sqlite3.Bjoern Breitmeyer2015-06-071-0/+2
| | | | | | | | | | | | Change-Id: Iaa953df941d888b8ae1a590dd728a1d819d7e604 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Make the test pass on high res mac displaysLars Knoll2015-06-061-2/+2
| | | | | | | | | | Change-Id: I05f156faae85abe11edc954dd358ddfcfd320c74 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Wait for the window being active before sending it eventsLars Knoll2015-06-061-0/+1
| | | | | | | | | | Change-Id: I2f5d6e37e630d70c4ba3ae81e807a89c447c8b26 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix the autotest on MacLars Knoll2015-06-061-1/+1
| | | | | | | | | | | | | | Don't hit the scrollbar with the mouse click Change-Id: Ie82d8c5c058df9a482e7d5de2fe40681572f19ad Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix qgraphicswidget::initStyleOption autotestLars Knoll2015-06-062-14/+6
| | | | | | | | | | | | | | make sure it'll work with the new mouse handling as well. Change-Id: Ia2d567e618b77b0fa3532ee6c335cbdf5e496241 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Clean up the qgraphicsscene autotestLars Knoll2015-06-061-22/+5
| | | | | | | | | | Change-Id: I8950a3eb9792dff90ed64cd3bf1d572745b05886 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Manual touch test: Add gestures.Friedemann Kleint2015-06-061-13/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add command line options for - Grabbing gestures - Suppressing mouse and touch events Add gesture events to the log. Add a hierarchy of gesture classes storing the parameters of finished gestures with drawing functionality and implement for pan and swipe. Task-number: QTBUG-46195 Change-Id: I019fe5b60116316a54e11b2c30e1d34f5e72bcf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * doc: Added Q_NEVER_INLINE to ignored tokensMartin Smith2015-06-051-0/+1
| | | | | | | | | | | | | | | | This helps qdoc's parser. Change-Id: I4c7f2dff348b87659c93ddb14d012d5bf2e626f2 Task-number: QTBUG-46498 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Keep the mouse timestamp for tests closer to the actual timeUlf Hermann2015-06-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass on the requested delay into the mouse events. We don't care about single msecs as the surrounding code also takes time that we don't consider and whenever we generate a release we add 500ms of time skew anyway. The initial press of a double click has to increment the timestamp, just like all other mouse events do. Change-Id: Ifb94830f9f878ce87d92bfd86c72a16b55052f3b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * qdoc: fix invalid memory access in HtmlGeneratorMartin Smith2015-06-051-1/+2
| | | | | | | | | | | | | | | | | | | | HtmlGenerator::highlightedCode() contained a potential out-of-range- memory reference, which is prevented by this fix. Change-Id: I3bc87a8287e1d51c2786f5ec42384dbac04c9636 Task-number: QTBUG-45643 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * qdoc: Just reformatting and removing dead codeMartin Smith2015-06-052-50/+6
| | | | | | | | | | | | | | Whitespace only. Change-Id: I6e4b55ad55e22da4150530457202f144fcc7f416 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * doc: Remove uses of \returnsMartin Smith2015-06-051-2/+2
| | | | | | | | | | | | | | | | | | It is a doxygen command that is not recognized by qdoc. Change-Id: I26b0c54a1aa715fc9d8b70e411502f46fc6bc0f1 Task-number: QTBUG-46495 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * doc: Remove uses of \mainclassMartin Smith2015-06-054-4/+0
| | | | | | | | | | | | | | | | This qdoc command is deprecated. Task-number: QTBUG-46476 Change-Id: Iee36f91bdcf500c2e88022a5f8a9c3accc6048c2 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Move the function helper to its own fileJorgen Lind2015-06-056-14/+20
| | | | | | | | | | | | | | | | Also make it a class so a forward header is generated by syncqt Change-Id: Ibab6b925dc6e9dab1b617b9b4027a4144e4a3773 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Fix crash in tst_qfiledialog on OS XSimon Hausmann2015-06-042-4/+14
| | | | | | | | | | | | | | | | | | | | The test aggressively shows and hides dialogs and popups, and we would end up installing this global event monitor frequently. However we never cleaned up properly, for example if the window didn't get hidden properly or if the monitor was already installed for some reason. Change-Id: I6fa28eaeb03e089ced735912dbe29b0b8ad75d58 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| * Fix tst_qglobalstatic on OS XSimon Hausmann2015-06-041-0/+21
| | | | | | | | | | | | | | | | | | | | OS X has an unreasonably low default for the maximum number of open file descriptors (256). The unit test creates about 200 threads and each thread in Qt creates at least two file descriptors (pipe), so the test cannot execute. Change-Id: I656367bca6d0a40fb1edb8c72914304db0f429ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devSimon Hausmann2015-06-04530-5850/+11954
| |\
| | * Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-03530-5850/+11954
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| | | * Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into ↵Liang Qi2015-06-0231-251/+491
| | | |\ | | | | | | | | | | | | | | | refs/staging/5.5
| | | | * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-0231-251/+491
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I060b0e10e55487a4a4a101f77ad7c8dc8cf0f553
| | | | | * Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into ↵Jani Heikkinen2015-06-0226-241/+405
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | refs/staging/5.5.0