summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Unicode data files to v8.0Konstantin Ritt2015-11-0519-624/+3314
| | | | | Change-Id: I0aa368cb07353924031a9af4f0bdc33692eb1053 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* RaspberryPi: Enable building with OpenVG supportAndy Nichols2015-11-042-1/+7
| | | | | Change-Id: Ib803e1d98b5d81d142b20d18e92d88942b9c4af5 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* RaspberryPi2: Support building Qt for Raspbian/DebianAndy Nichols2015-11-041-0/+1
| | | | | | | | | | | | | Raspbian/Debian require a toolchain with the multiarch patches so we need to add deb-multi-arch to the DISTRO_OPTS variable for pkgconfig to work correctly. The Raspberry Pi 1 mkspec has this already and can be used to build Qt for both versions of the Pi, but the Raspberry Pi 2 mkspec is missing this, and would not be usable in its current state for building for Raspbian/Debian which is the most popular distro for the Raspberry Pi. Change-Id: I6a7a08059f9f91da524b5f51e0697115ef684f30 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Cocoa integration - do not send move events while in -draggingUpdated:Timur Pocheptsov2015-11-042-1/+10
| | | | | | | | | | | Looks like it's not a good idea to send constant 'fake' mouse move events while mouse is actually moving (mouseDragged/rightMouseDragged) + we're receiving -dragginUpdated:. Change-Id: Ibed5def3d8f06b764dea6c2cd196e37ca19ce967 Task-number: QTBUG-49204 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
* QWindows*Style: remove use of obsolete QStyleOption*V<N>Marc Mutz2015-11-045-54/+34
| | | | | | | They are obsolete since Qt 5.0. Change-Id: I59f8b30ec877c5124922ab12ef38fbe33a1ae6b8 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* [docs] QVector: don't scare people away from reserve()Marc Mutz2015-11-041-9/+18
| | | | | | | | | | reserve() is a good thing, and key to getting top performance out of any data structure that provides them, yet the existing docs scared people away by claiming that "you will rarely ever need to call this function". Change-Id: I88e30d96960443c0ed759a79c6fa9ee6af0d1e07 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QMacStyle: remove use of obsolete QStyleOption*V<N>Marc Mutz2015-11-041-37/+28
| | | | | | | They are obsolete since Qt 5.0. Change-Id: If62187e39bf18dcd6d019ae4bca58c54c6a241ca Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* QtWidgets: remove use of obsolete QStyleOption*V<N>Marc Mutz2015-11-046-78/+60
| | | | | | | | They are obsolete since Qt 5.0. Change-Id: I3a1ee314126bd245a3c788ac7af49905ab50945f Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QtConcurrent: Use Q_NULLPTR instead of 0 in all public headersMarc Mutz2015-11-042-2/+2
| | | | | | | | | | | | This is in preparation of adding -Wzero-as-null-pointer-constant (or similar) to the headers check. Since QtConcurrent is basically all-templates, not all uses of 0 as nullptr might have been detected by the headersclean check. Task-number: QTBUG-45291 Change-Id: Iffcabdbab26b56597700346cd039d0c32c4fddca Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows: Use logical DPI to activate High DPI scaling.Friedemann Kleint2015-11-041-2/+5
| | | | | | | | | | | High DPI should be disabled when the user chooses small fonts on a High DPI monitor, resulting in lower logical DPI. The auto-algorithm should then be equivalent to that of the device pixel ratio scaling of Qt 5.5. Task-number: QTBUG-49195 Change-Id: I756770ec7251b5b9b901253ded82e829aa50d38b Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Suppress the modal window handling for dialogs embedded into QGraphicsView.Friedemann Kleint2015-11-042-6/+37
| | | | | | | | | | A dialog embedded into QGraphicsView has Qt::WA_DontShowOnScreen set (similar to a native dialog). It must not trigger the modal handling though as not to lock up. Task-number: QTBUG-49124 Change-Id: I22ce3f18d01df017b9317666770686bd4491387f Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* Doc: corrected error about path list separatorNico Vertriest2015-11-041-10/+12
| | | | | | | | Task-number: QTBUG-48673 Change-Id: Id5b99c0dd778b55c937d345e49995086c5ef372e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: fixed broken linksNico Vertriest2015-11-044-6/+6
| | | | | | Task-number: QTBUG-43810 Change-Id: If6ac30a0407731b31e8aaad28d33e2bb49dee6f3 Reviewed-by: Martin Smith <martin.smith@digia.com>
* winrt: Don't wait for runOnXamlThread to finish for timers.Samuel Nevala2015-11-042-13/+15
| | | | | | | | | Fixes possible deadlock that occurs when synchronous WS event handling (introduced in ee767c8) is used across threads. Task-Id: QTBUG-49051 Change-Id: Iae973c2d4f4619b9eeb6e9393330b166ec608d27 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* winrt: move input context creation into xaml threadMaurice Kalinowski2015-11-041-1/+1
| | | | | | | | | | This way we ensure that creation always works and we can access the input pane statics. Task-number: QTBUG-49034 Change-Id: I5d0340a7f6304b717f17f2106134fa9d083a7fde Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* Workaround part 2: don't use the version tagging symbols on AndroidThiago Macieira2015-11-041-1/+1
| | | | | | | | | | | | | | Commit d020e0781cf8647d87f7088350e40adf4f0cf8fe added a workaround to the QtCore build due to a qmake bug in handling the extra target on a Windows host. The workaround removed the tagging symbols from QtCore. This commit removes the using of those symbols from everywhere else. Task-number: QTBUG-49208 Change-Id: Idba8c29717f34c70a58fffff14133399f9f0b7f2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2015-11-0417-57/+196
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-0417-57/+196
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qstorageinfo_unix.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/styles/qwindowsvistastyle.cpp Change-Id: Ie1725933815891cc8c86258d4c0e8ed0ab386edf
| | * fix MinGW ANGLE buildLiang Qi2015-11-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | glslang_tab.cpp was not created in the right subdirectory. This amends commit 69167189. Change-Id: I031499baa53b72a1923883c58eb5ddfc2a02789a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * QWindowsPipeReader: fix occasional "Unknown error 995"Joerg Bornemann2015-11-022-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After canceling the asynchronous read operation, the notified() slot receives ERROR_OPERATION_ABORTED. We must not handle this situation as an error. This amends commit 5ce567c5. Task-number: QTBUG-48336 Change-Id: Iff948ceb3ad1f805a9de8c188fbc39ed4c76ba82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Fix Vista style compilation with QT_NO_ACCESSIBILITYDyami Caliri2015-10-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | A recent change uses an accessibility function even if accessibility is disabled. Change-Id: Ibf9afbb90120772065743b2f9dd3615e4e6a2f37 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| | * Windows: Delay-initialize pluggable touch devices.Friedemann Kleint2015-10-285-21/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move touch device initialization code to QWindowsContext and replace the assert on the touch device in QWindowsMouseHandler by a call to the initTouch(). Task-number: QTBUG-48849 Change-Id: If8573b8283ef94e7fd015f6edc626e3c8cc0b139 Reviewed-by: Joni Poikelin <joni.poikelin@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Check if the session is valid before connecting to itAndy Shaw2015-10-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since there are circumstances where the session is not yet created after start() is called then we should check if the session is valid before connecting to it. Change-Id: I94236f76e4be2433a8c96eb91ce2d4b4d42f2fd9 Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Return early if there is no text at the offsetAndy Shaw2015-10-271-0/+8
| | | | | | | | | | | | | | | Change-Id: I9d0b1e6e054a48bac34fb4e51b656c475f5638b4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| | * Fix QStorageInfo on BSD4 systemsDmitry Shachnev2015-10-271-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - On NetBSD, the defines were not properly defined; - On all other BSD systems, we use statfs which does not have f_frsize member, revert to using f_bsize there. Task-number: QTBUG-48267 Change-Id: Ia1ed484ac61a615fcbb5b45affb516b5e86a64b0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * fix race in ANGLE buildJoerg Bornemann2015-10-273-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The flex and bison rules generated the same files for debug and release. This conflicts in parallel builds, e.g. when using jom. Task-number: QTBUG-49003 Change-Id: I6f64760d83292e8bfad6fd0b4f8fbdd386e2213b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Android: auto-detect MIME type for local files to make openUrl workMartin Koller2015-10-262-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtCore][Android] Fixed the opening of a local file using QDesktopServices::openUrl(). For a local file to be viewed with QDesktopServices::openUrl(), Android needs to be given the MIME type otherwise it does not start an Intent to view the file. Task-number: QTBUG-45585 Change-Id: Ifcfce4bff35011f205cfadbdb2b37a1780dac87d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * fix growth of event queue in QWinOverlappedIoNotifier::waitFor*Joerg Bornemann2015-10-261-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not emit _q_notified when we're in a wait function. Otherwise, the queued signals could pile up in the event queue. Task-number: QTBUG-48653 Change-Id: I071863e2356e17c7004e3b7ca359967cb115e343 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Undef HAVE_WAITID if needed constants are not definedDmitry Shachnev2015-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | That is the case on Hurd, where the code currently breaks because Hurd does not have WEXITED or WNOWAIT defined. Change-Id: I4b13633612b1168d36c949d9e8b35bc05bca7d5c Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | winrt: Avoid blocking the XAML threadSamuel Nevala2015-11-041-34/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blocking the XAML thread can lead to a deadlock, so switch to the non-blocking version of handleExtendendKeyEvent. Task-Id: QTBUG-49051 Change-Id: I65a348af1f77b6afcd7d0fb9a80c70d60fc94c27 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | | Make variable const as it should beEdward Welbourne2015-11-041-1/+1
| | | | | | | | | | | | | | | Change-Id: If5782473eceaa38de75b25d1da247dea9fe135da Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Use memset to clear struct tm before filling fields.Edward Welbourne2015-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This ensures any non-standard fields (e.g. glibc's tm_gmtoff) are clear, as well as the other fields mktime overtly promises to ignore. Change-Id: I45d69eff7b5cb37ab910bf3d4d2d1481fd93aedb Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Update high-DPI scaling enablers.Morten Johan Sørvig2015-11-043-15/+40
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to enable and disable both at the environment variable level and at the source code level. This applies to scaling done by Qt using display density information provided by the operating system. Disabling is done with a 'veto' system: both the environment and source code my prevent the other for enabling scaling. This covers use cases of 'my system does not provide correct display metrics' and 'my application needs access to display pixels', respectively. On the environment, scaling is now enabled with QT_AUTO_SCREEN_SCALE_FACTOR=1 and disabled with QT_AUTO_SCREEN_SCALE_FACTOR=0. In source code the corresponding application attributes are AA_EnableHighDpiScaling and AA_DisapleHighDpiScaling. Not setting any of these indicates 'no preference'. The global scale factor set by QT_SCALE_FACTOR is not affected by any if the disablers. Task-number: QTBUG-46615 Change-Id: If18607d4b56ace1914a710e5aa60b2f0968e0010 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Modify QPA handleExtendedKeyEvent.Samuel Nevala2015-11-032-3/+3
| | | | | | | | | | | | | | | | | | Allow setting tryShortcutOverride for handleExtendedKeyEvent with no timestamps. Change-Id: I469b144cfcaf063861debe86195e1f96ac94cc37 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | QAndroidStyle: remove use of obsolete QStyleOption*V<N>Marc Mutz2015-11-031-12/+7
| | | | | | | | | | | | | | They are obsolete since Qt 5.0. Change-Id: I1295ba7a8895b1f066b8714dda40afd619018dce Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | configure: set ltcg only for Qt modulesPeter Kümmel2015-11-031-3/+3
| | | | | | | | | | | | | | | | Adding ltcg to qconfig.pri enables ltcg unconditionally for everyone using msvc. Change-Id: Ie1d11612a10fcdcb27de41664141e661a17323dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Apply Qt-specific changes to the bundled FreeTypeKonstantin Ritt2015-11-031-1/+1
| | | | | | | | | | | | Change-Id: I2a5719be48ed8e42ec373ac36d52735a40e85aa0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Update bundled FreeType to 2.6.1Konstantin Ritt2015-11-03499-8603/+10562
| | | | | | | | | | | | Change-Id: Ic489f8aa8ad42da3922f542e6c9064afe44f3799 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Apply Qt-specific changes to the bundled HarfBuzz-NGKonstantin Ritt2015-11-031-2/+49
| | | | | | | | | | | | Change-Id: I026bc42066cd87b72bce05198aab792c979d7191 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Update bundled HarfBuzz-NG to 1.0.6Konstantin Ritt2015-11-0375-2102/+4354
| | | | | | | | | | | | | | | | | | | | - Unicode 8.0 support - Universal Shaping Engine - Various fixes, improvements, optimizations, etc. Change-Id: Ib6f8c92fa275c2a6575b9ae09068c92aecac7b4e Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | QDockAreaLayoutInfo::updateTabBar(): Save and restore current index.Friedemann Kleint2015-11-032-0/+45
| | | | | | | | | | | | | | | | | | When rebuilding the tab bar after hiding several dock widgets, the index gets offset. Task-number: QTBUG-49045 Change-Id: I05f6a976ca1d8c6f7cdf6532f1a728483398eabc Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QStyleSheetStyle: remove use of obsolete QStyleOption*V<N>Marc Mutz2015-11-031-16/+16
| | | | | | | | | | | | | | | | They are obsolete since Qt 5.0. Change-Id: I3bf9926fada136dda7406dc5f7b8edb3c71b55a9 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | tests: remove use of obsolete QStyleOption*V<N>Marc Mutz2015-11-035-31/+13
| | | | | | | | | | | | | | They are obsolete since Qt 5.0. Change-Id: Iefe47684526832def8fc5be5a170817059dcc530 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | Doc: replaced mentions of deprecated functionNico Vertriest2015-11-031-10/+9
| | | | | | | | | | | | | | | | | | setDefaultCaCertificates() --> QSslConfiguration::defaultConfiguration().setCaCertificates() Task-number: QTBUG-49119 Change-Id: I0b53165fe658bb7e459ad7a5960210fc6c91b916 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Rename "wl_display" native resourcePaul Olav Tvete2015-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | There is already a "wl_display" resource used by the client-side Wayland plugin. This is confusing, and would cause horrible bugs if ever a Wayland server was run as a client (the nested compositor usecase). Therefore, use "server_wl_display" for the name of the resource to be used on the server side. Change-Id: I30455177a154e89b98ad3620b6a14626b821e54c Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Blacklist tst_QPrinter::doubleSidedPrinting for msvc 2013Frederik Gladhorn2015-11-031-0/+3
| | | | | | | | | | | | | | | | This test keeps on failing on Windows 8 with 32 bit. Let's add the platform despite this one test failing. Change-Id: Id6a2b3e0b587d3cff29d1f616d5edacfcf68746d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Fix build with Xcode 7.1 toolchainTor Arne Vestbø2015-11-031-1/+3
| | | | | | | | | | Change-Id: Iab8111e4d3fd7ce68aae35eb6c0b600262ba3f10 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Windows: Default to vertical hinting when high-dpi scaling is enabledEskil Abrahamsen Blomfeldt2015-11-031-3/+8
| | | | | | | | | | | | | | | | | | | | | | Since hinted text layouts are not scalable, we should disable hinting by default when the high-dpi scaling is active. This is the Windows version of 0f7bc885aa7ae8cc3c448cc751aba4eba8c1c8b8, which solved the same issue for the fontconfig database. Change-Id: I48b5da5b045dec195fd257743175017f39cf9620 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Fix the closeEvent of the systray example on OS XAlejandro Exojo2015-11-032-1/+10
| | | | | | | | | | | | | | | | | | | | | | The implementation of the close event handler requires handling the two close events that are received on OS X when the user quits through the application menu bar or the Command+Q shortcut. The first is an spontaneous event, and the second a non-spontaneous one with the window already closed. Change-Id: I24e3d3f0de4d631bd2d5616c85ce747f085691e0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | QtWidgets: Do hide/show via WA_OutsideWSRange for native widgetsUlf Hermann2015-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a native widget has a width or height of 0 we don't have to invalidate its backing store as that is done by the window system. Certain applications rely on ... interesting ... behavior of certain window systems in this case. Task-number: QTBUG-48321 Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>