summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* xcb: Handle screen siblings in QXcbVirtualDesktopAlexander Volkov2015-11-173-15/+17
| | | | | | Change-Id: I2f3c3ad75bb3914667cf6f27dc2d91aac103607b Reviewed-by: Błażej Szczygieł <spaz16@wp.pl> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* QTest::mouseEvent expects window-local coordinates.Volker Krause2015-11-171-1/+1
| | | | | | | | This makes the automatic center click feature of the mouse event methods also work if the target window isn't positioned at 0,0. Change-Id: I0d711e484620900ba2ffc4139f7e13346a7482d3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* wirt: Fix cursor position method.Samuel Nevala2015-11-171-6/+10
| | | | | | | | | | | | The native position is given in device-independent pixels, so multiply that by the window scale factor. If no cursor is present (e.g. on Windows Phone), the native API returns SHRT_MIN as the coordinate values. Catch that and pass Infinity instead in order to enable the cursorless fall-back behavior in QQuickMenu::popup(). Change-Id: Ibe8ebcdbe257e8df25eea9873e8f4fa647ae1ab2 Task-Id: QTBUG-48265 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* tests: blacklist the data row which uses internet in tst_qftp.cppLiang Qi2015-11-171-0/+3
| | | | | | Task-number: QTBUG-49485 Change-Id: I2e4af34cd148e7aa888bf93cafa012515c5cd504 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Windows: Open GL - Blacklist all 6th generation intel hd graphics devicesTim Blechmann2015-11-171-1/+1
| | | | | | | | | | | | | | the windows driver for Intel HD Graphics 3000 is buggy. the original blacklist was using device ids from: http://www.pcidatabase.com/search.php?device_search_str=graphics however this list seems to be incomplete. to be on the safe side, we should blacklist all 6th generation devices, as taken from: https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Sixth_generation Change-Id: I1bb6c39a310d741b7a9eb0fed9767bb316415996 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* tst_qfilesystemwatcher: Blacklist flaky tests on Windows.Friedemann Kleint2015-11-171-2/+2
| | | | | | | | | Extend the current BLACKLIST to cover all all Windows versions and add watchFileAndItsDirectory:native backend-testfile. Task-number: QTBUG-30943 Change-Id: Ic58c090f23d3584843bc1e74eba533d75c530ad3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Use “Adwaita” as the default icon theme for QGnomeThemeDmitry Shachnev2015-11-171-1/+2
| | | | | | | | | | | | | | That is the new name for gnome-icon-theme for more than 1.5 years. See [1] for details. Still keep “gnome” as the fallback icon theme, so this commit should not break anything. [1]: https://mail.gnome.org/archives/desktop-devel-list/2014-April/msg00086.html Change-Id: Ifc2178827ad2cf6fdbc4e5248c83789ebc5b797e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com>
* winrt: Do not emit keyboard changes in the constructorMaurice Kalinowski2015-11-161-5/+10
| | | | | | | | | | QWinRTInputContext is created from the XAML Thread, which can cause problems when handleVisibilityChange is invoked. Instead just query the keyboardRect and skip the emit. Task-number: QTBUG-49389 Change-Id: I158204a07b9e000adffdc308e68b0f1425ed7c62 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* Fix screenForGeometry on a corner caseAleix Pol2015-11-161-1/+3
| | | | | | | | | | | | QRect only deals with integers, and I had a window set on the corner and without a size. When this screen was created, it was reported to be on the wrong screen, thus created there wrong. The reason for this is that ::center is not prepared for this use. QRect(QPoint(500,500), QSize()).center() is QRect(499, 499) Change-Id: I24e57182f84873306f180749e96368d6da1147a9 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Doc: Added info about sorting in QItemSelectionModel::selectedIndexesNico Vertriest2015-11-161-0/+1
| | | | | | Task-number: QTBUG-40726 Change-Id: I450f9735fbbdc6574e8a14ea0076a28ee65077de Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: added specs to setHorizontalHeaderItem()Nico Vertriest2015-11-161-0/+2
| | | | | | | | Added that adding an item deletes an existing one Task-number: QTBUG-42105 Change-Id: Ibcf08e6e2bf9c9239e7eca5aa48f2f30c8417fec Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: removed 2 invalid external links in external resources.Nico Vertriest2015-11-161-10/+0
| | | | | | | | | Link to Using a Designer UI File Task-number: QTBUG-49251 Change-Id: I9d2e5ad746ce5c3933f28b8159e381dcdb8e643a Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Corrected minor typoNico Vertriest2015-11-161-1/+1
| | | | | | Task-number: QTBUG-27499 Change-Id: I20b8da6300b84a107f6f581b99c63a39f8455d6c Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: corrected snippet QSqlTableModelNico Vertriest2015-11-161-2/+3
| | | | | | | | Wrongly used QSQLQueryModel previously Task-number: QTBUG-35860 Change-Id: I059ba45e54ac67b75b68eb0b804f66642b87a29f Reviewed-by: Martin Smith <martin.smith@digia.com>
* remove pointless conditional definesOswald Buddenhagen2015-11-161-1/+0
| | | | | | | wince triggers the functionally identical cross_compile scope above. Change-Id: I92cdbb1df51599b2b4aa8a7ca2f3d6407034ba26 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* move addition of libdl to right projectOswald Buddenhagen2015-11-162-2/+2
| | | | | Change-Id: Ifae8b906ef3767d9c21f09953076bd640829858f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* remove abuse of module include path overridesOswald Buddenhagen2015-11-162-14/+0
| | | | | | | | these modules simply have no "proper" include paths (they are used only within qtbase, with explicit INCLUDEPATH statements). Change-Id: Iec6aa6ae0bc449eb8cac2fa1c86a791755eec06e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* QChar: Simplify case convertion code with template magicKonstantin Ritt2015-11-161-51/+21
| | | | | | | Same as in QString, though simpler a bit due to fixed-length sequence. Change-Id: Idd6670a7b6415f5d515987c30931d16b73dd280e Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Move CasexTraits from qstring.cpp to qunicodetables_p.hKonstantin Ritt2015-11-163-24/+64
| | | | | | | | and implement TitlecaseTraits as well, to be re-used in the following commit. Change-Id: I5c0bff42fe3b9bc9c2454cc16916cc2be87f604f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QFontEngineFT: Optimize format convertion code with template magicKonstantin Ritt2015-11-161-16/+38
| | | | | | | | Avoids in-loop check for every pixel by costs of slightly bigger code. Change-Id: I8321d0945ac6b677786431670b2316c60e4db492 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QFontEngineFT: Revise the legacy LCD filter implementationKonstantin Ritt2015-11-161-22/+15
| | | | | | | | | | | Use an optimized version of the intra-pixel filter found in FreeType's _ft_lcd_filter_legacy(). Gives us somewhat better accuracy and better performance. Change-Id: Id4200b67e6ff55f605037c3e5464fef8bb03fbde Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix falsely reported style for fallback fontEskil Abrahamsen Blomfeldt2015-11-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 8f6b3284106fa11129e4fa6e5ec3adc6cb1f489f we override the fontDef of the fallback font with the fontDef of the original font (with the family name replaced) to fix a regression where boldness was not inherited by the fallback font. This caused a bug, though, since the contents of the fontDef would now misrepresent the actual font used. The side effect of this was that isSmoothlyScalable() returned false because the family and styleName combination we claim to have did not exist in the font database. Result: We fell back to native rendering for the font even though it's scalable. Weight and style are the only parts that should be inherited, since they are synthesized. So rather than overwriting the fontDef completely, we copy the weight and style when needed. The bug in QTBUG-42963 is still fixed after this change. [ChangeLog][Text] Fixed problem where fallback fonts for text with certain styles would be reported as unscalable. Change-Id: I95ef67f818852aea5a6ae8df789a52364ecb59a6 Task-number: QTBUG-47547 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* OS X: Don't forward key events to popup window if it's a tooltipTor Arne Vestbø2015-11-161-2/+4
| | | | | | | | | | | | 676edc006e9f43 introduced a regression by not filtering the active popup window for tooltips, which is what the corresponding mouse handler in QNSView does. Change-Id: I5091dba0dd43be2e859ea360dfd812c0f081fd32 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Fix OS X 10.11 (Xcode 7.1) build issues due to strongly typed enumsTor Arne Vestbø2015-11-162-16/+25
| | | | | | | | | | | | | | | | | | | | | Apple changed some enums in the 10.11 SDK from being just: enum { ... }; typedef uint64_t Foo; to: typedef CF_ENUM(uint64_t, Foo) { ... }; which in C++11 mode expands to: typedef enum Foo : uint64_t Foo; enum Foo : uint64_t { ... }; The use of strongly typed enums means we need to explicitly cast from int in the places where we know what we are doing. Change-Id: I7c8cfdbc0549471a3292de14d8b766fe17133e25 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Compile minimalegl QPA plugin on Windows/WinRT.Friedemann Kleint2015-11-141-1/+40
| | | | | | | | Add event dispatchers. Change-Id: I548b50d1ec648fa8cb6c77881c95125f361343f0 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Windows: Move GUI event dispatcher to QtPlatformSupport.Friedemann Kleint2015-11-148-39/+50
| | | | | | | This makes it possible to reuse it for the minimalegl QPA plugin. Change-Id: I1c3dbaf67f32294a5d0e03cc1eb8557049b810a5 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Install fixqt4headers.pl scriptFrederik Gladhorn2015-11-141-0/+5
| | | | | | | | | Task-number: QTBUG-45662 Change-Id: If03b623d4ebcc5cf81b94d2e87ab753a553cff35 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* winrt: Launch application on Windows 10 Mobile finalMaurice Kalinowski2015-11-143-7/+6
| | | | | | | | | | | | | Between the very latest images linking against kernel32.lib has been forbidden. This is completely undocumented and only throws a "dependent dll not found" error. Instead we should link against OneCore for msvc2015, which can be used for Windows 10 Desktop and Mobile. Task-number: QTBUG-49349 Change-Id: I21d32a92dfd41548ca563d3e56c623a0cb297588 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Make CoreFoundation event dispatcher available on OS X alsoTimur Pocheptsov2015-11-132-9/+14
| | | | | | | | | | CoreFoundation event dispatcher on OS X can help users working with QtBluetooth from either non-GUI threads or non-GUI applications. Change-Id: Ie0793e7f49074a8ea9059251cd7c9bdf7953c206 Task-number: QTBUG-48758 Task-number: QTBUG-46625 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Windows/Direct2D: Handle screen changes after window creation.Friedemann Kleint2015-11-135-19/+32
| | | | | | | | | | | | | | | | | Call QWindowSystemInterface::handleWindowScreenChanged() in QWindowsIntegration::createPlatformWindow() should the effective screen be different from the initial screen due to the geometry. In order to avoid code duplication in the Direct2D plugin, fold the helper method createWindowData() into QWindowsIntegration::createPlatformWindow() and introduce a new virtual helper to create the actual platform window for QWindowsDirect2DIntegration to hook in. Task-number: QTBUG-48379 Change-Id: I49c7a50a12245691414ab49bffe802239a87d2d6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QFontEngineFT: Minor optimization to convertGRAYToARGB()Konstantin Ritt2015-11-131-6/+9
| | | | | | | | | Precalculate everything we can and use faster loop. Make inlined as it is used just in a single place. Change-Id: If3c33d60739eb4ce896020321442ae81edd1c13d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QTextEngine: Apply CoreText specific post-processing for QFE::Mac onlyKonstantin Ritt2015-11-131-13/+14
| | | | | | | These tricks has no meaning to other font engines (i.e. to FreeType). Change-Id: I0410693d4d159367d760433062506691dc7c4610 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QTextEngine: Do not disable graphite2 HB shaper backendKonstantin Ritt2015-11-131-15/+14
| | | | | | | | | | | | This fixes-up bf013c9e745c63cb112be4d3a37027ff997927dd by specifying graphite2 shaper in a "safe" shaper list, one used for non-CoreText font engines (currently, FreeType font engine only). Make the the comment and the code a bit cleaner about the fallback shaper list. Change-Id: Ib0cedc0b593023c9ee771e8e98c314d9c8f13037 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QFontEngine: Check for AAT support only with HB-NGKonstantin Ritt2015-11-131-5/+3
| | | | | | | HB-old is unable to handle these anyways. Change-Id: Ibe69b5d030134b8a0a76dc966b6dfc6b5ff9a883 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QUnicodeTables generator: Minor clean-up & stricter checksKonstantin Ritt2015-11-132-71/+66
| | | | | | | | | | Use static_cast instead of C-style cast; ushort -> unsigned short; Avoid a lvalue in qGetProp(); Minor styling fixes. Change-Id: Ic6412e28ac9316a587d32d0e674d21f672967fd6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Introduce png_dependency.priKonstantin Ritt2015-11-132-6/+7
| | | | | | | | | Just like any other x_dependency.pri, it shall be included instead of linking with png lib directly. Change-Id: I698c8a8137f937d2e2c5f5dc9b9188b780c9e49a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Doc: corrected error in doc static pluginsNico Vertriest2015-11-132-6/+6
| | | | | | | Task-number: QTBUG-43160 Change-Id: I94f92318cec095391050b2af90980010bd1066b9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Blacklist tst_qfontdialog::setFont on RHEL 6.6Frederik Gladhorn2015-11-131-0/+1
| | | | | | | | | | | This is due to the Gtk style in use. It is already blacklisted for Ubuntu and in Qt 5.7 we'll use Gtk 3, so there is no reason to invest into fixing this. The test used to pass because we would build with -no-gtkstyle. Change-Id: I1cf26301ba8b19be9a995837b0b5984838ec777a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Blacklist tests that fail with Gtk style on RHEL 6.6Frederik Gladhorn2015-11-132-0/+2
| | | | | | | | | | | tst_qmenubar::taskQTBUG4965_escapeEaten tst_qtabbar::sizeHints These tests will not pass when Gtk style is enabled, similar to the Ubuntu blacklisting. Change-Id: I590d84fb7ce0df28d0e8525e0f04b676280a12ff Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* MakefileGenerator::processSources() doesn't need to be virtual.Edward Welbourne2015-11-132-2/+1
| | | | | | | | Only VcprojGenerator over-rode it; and did so with a replacement identical to the one on the base, so there was no point to it. Change-Id: I5b899372247809c82b1cae25817e06c5849cd10d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Make qt_findAtNxFile return the source device pixel ratioOlivier Goffart2015-11-133-11/+23
| | | | | | | | QTextImageHandler needs it. And QQuickImageBase will also need it. Change-Id: Ica5d17519c4c6c06e25bab7d2b1d3733f4058425 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Document performance of QMutexOlivier Goffart2015-11-131-0/+7
| | | | | Change-Id: I4de2fd5ba717975b5de98ffe7ca6348afbed1b2f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Docs: Add a note clarifying that Q_MOVABLE_TYPE is not about move semanticsOlivier Goffart2015-11-131-1/+2
| | | | | Change-Id: Ib1fb9ac00c0437ed2312c46e3e97d7ece05ba8e8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* move styleOverride from QApplicationPrivate to QGuiApplicationPrivateLiang Qi2015-11-134-16/+18
| | | | | | | * -style option is also used in other cases than widget world Change-Id: I8555d309a7b9df0d26ad7a7b930411260537180e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* JSON: Fix MSVC2013 warningsOrgad Shaneh2015-11-132-4/+4
| | | | | | | | | | | | json_p.h(283) : warning C4800: 'uint64_t' : forcing value to bool 'true' or 'false' (performance warning) json_p.h(546) : warning C4800: 'uint32_t' : forcing value to bool 'true' or 'false' (performance warning) qjsonvalue.cpp(176) : warning C4244: '=' : conversion from 'int64_t' to 'double', possible loss of data qjsonvalue.cpp(518) : warning C4244: 'return' : conversion from 'const double' to 'int', possible loss of data Change-Id: I2a24f90f7615aeb47f747ecbe3b580f23773ebda Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Do not overwrite detailed error message if process fails to launchKai Koehne2015-11-125-8/+9
| | | | | | | | | | | | | On Unix we get a detailed error message when a process fails to start, but later on we overwrite it with a generic "Process fails to start". Fix this by keeping the original error message (if one is available). This fixes a regression introduced in commit 5147f73ac3. Task-number: QTBUG-49286 Change-Id: Idd0f0fed9773d39f2947fc3e532b51e670952caf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Prefer "daylight-saving time" and "DST" over "daylight time".Edward Welbourne2015-11-126-87/+85
| | | | | | | | | | | The first two are the "proper" terms; the last is a colloquialism. Also amended "daylight savings" (which summons to mind a hybrid of "daylight robbery" and "bargain-basket savings"). Improved related wording in many of the places amended. Task-number: QTBUG-49308 Change-Id: I726f18a344b2fe37f765a14684d1447c8b7ab00c Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Eliminate duplicate "between"Edward Welbourne2015-11-121-2/+3
| | | | | Change-Id: I548e2df4cb94e41bb5247fc6977a3c3f67bf0bda Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* winrt: Make dialog and window behave similarly.Samuel Nevala2015-11-122-2/+4
| | | | | | | | Status bar visibility can be controlled from dialog and dialog size is screen size. Change-Id: Ia8e932a9e1e1549a17d12532639391335760f9e0 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* winrt: Clean up QNativeSocketEngineOliver Wolff2015-11-121-110/+112
| | | | | | | | | | | | WinRT/Windows Phone "coding guidelines" are now used for the native socket engine as well. - Whenever an operation is expected to succeed Q_ASSERT_SUCCEEDED is used. - QWinRTFunctions::await is used for waiting for async operations - Improved error handling Change-Id: I6c8d64731da5c94b911a5190231c7c8f68d9c261 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>