Commit Graph

25619 Commits

Author SHA1 Message Date
Thiago Macieira
7c05a0cc99 Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6 2015-11-18 00:30:38 +00:00
Oswald Buddenhagen
b72d1db446 centralize determination whether a module is built as a framework
Change-Id: Ie5f8ab6bb789536707050f0fd83b953650028cf2
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2015-11-17 20:22:33 +00:00
Oswald Buddenhagen
6c5d227da1 don't create .pc files for frameworks and internal modules
frameworks are currently broken anyway, and we don't create .pc files
for the private part of public modules, so creating them for entirely
private modules is just inconsistent.

Change-Id: I98da8def73d72ac69b9b246687dce6b1fd150f61
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2015-11-17 20:22:29 +00:00
Oswald Buddenhagen
004aeff8ee don't create distclean targets in minimal syncqt mode
the projects which use full mode with the named modules have them.

Change-Id: I3b9383d1cc2b43411c25690a5e35e7e84a55aa23
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2015-11-17 20:22:25 +00:00
Oswald Buddenhagen
5c2c890b01 (re-)move qt build specific dependency checks from generic paths
the check whether a module depends on itself should be done by the code
which *builds* modules, not which *uses* them.

the check whether a plugin tries to use itself seems kinda pointless in
the first place, so just remove it.

Change-Id: I89b357dae7d7979d131b6824f197e7088047272f
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2015-11-17 20:22:21 +00:00
Oswald Buddenhagen
ded63fbb94 make a proper header-only module for QtZlib
that way other modules can use the headers without hacks.

this required making the base directory for paths in headers.pri
configurable in syncqt.

Change-Id: Id35cfe05bcf4c576d3f2d0d8d09590a5e23d21d3
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2015-11-17 20:22:17 +00:00
Oswald Buddenhagen
3d3b4129cd unbreak relative rpaths on darwin
check the right variable.
amends 8e846b33.

Task-number: QTBUG-49369
Change-Id: I9108d13b5e9c93aadaa802a62ba64816d81448d5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-11-17 20:22:08 +00:00
Oswald Buddenhagen
0dcf35cdd9 don't create version script for header-only modules
there is nothing to link with it anyway.

Change-Id: I2e942d24bb39855b3682f3e8d85cb6abca75cb61
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2015-11-17 20:22:05 +00:00
Oswald Buddenhagen
8df17d233c introduce -optimized-tools option
instead of building host tools always in debug mode, follow the overall
build type, and provide an option to override it.

this supersedes the pre-existing -optimized-qmake option.
however, that option never existed in the windows configure, and this
legacy continues as far as qmake is concerned (msvc builds of qmake are
always somewhat optimized, but not mingw builds).

Change-Id: I42e7ef1a481840699a8dffff13fec2626af19cc6
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-11-17 20:21:54 +00:00
Alexander Volkov
2047fe9253 xcb: Process _NET_WORKAREA and screen geometry changes separately
This commit allows to avoid superfluous calls to the X server.
We don't request _NET_WORKAREA values when the screen geometry changes,
and we avoid RandR calls on each _NET_WORKAREA change.
Besides, update the available geometry of all screens with the
same root window, rather than only that one which corresponds
to Qt::Desktop window.

Change-Id: I5ec624717f5f261c986cd9aaf2425f22985e11c0
Reviewed-by: Błażej Szczygieł <spaz16@wp.pl>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2015-11-17 18:08:31 +00:00
Alexander Volkov
8beec99899 xcb: Handle screen siblings in QXcbVirtualDesktop
Change-Id: I2f3c3ad75bb3914667cf6f27dc2d91aac103607b
Reviewed-by: Błażej Szczygieł <spaz16@wp.pl>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2015-11-17 18:08:21 +00:00
Volker Krause
874aaa6ea0 QTest::mouseEvent expects window-local coordinates.
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>
2015-11-17 15:30:40 +00:00
Samuel Nevala
4f1234033b wirt: Fix cursor position method.
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>
2015-11-17 14:59:47 +00:00
Liang Qi
4e7c0993d5 tests: blacklist the data row which uses internet in tst_qftp.cpp
Task-number: QTBUG-49485
Change-Id: I2e4af34cd148e7aa888bf93cafa012515c5cd504
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
2015-11-17 14:47:33 +00:00
Tim Blechmann
f49deb790f Windows: Open GL - Blacklist all 6th generation intel hd graphics devices
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>
2015-11-17 14:29:20 +00:00
Friedemann Kleint
a981ba8c5a tst_qfilesystemwatcher: Blacklist flaky tests on Windows.
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>
2015-11-17 14:27:23 +00:00
Dmitry Shachnev
2a2ca8e6bb Use “Adwaita” as the default icon theme for QGnomeTheme
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>
2015-11-17 14:19:35 +00:00
Liang Qi
17dc773221 Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I6b1fe0c6c360a0d5285911869f0f4f93d86d822e
2015-11-17 07:14:16 +01:00
Maurice Kalinowski
99d061ffd5 winrt: Do not emit keyboard changes in the constructor
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>
2015-11-16 19:44:28 +00:00
Aleix Pol
d2792d2ed9 Fix screenForGeometry on a corner case
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>
2015-11-16 16:01:03 +00:00
Nico Vertriest
d0f57439d0 Doc: Added info about sorting in QItemSelectionModel::selectedIndexes
Task-number: QTBUG-40726
Change-Id: I450f9735fbbdc6574e8a14ea0076a28ee65077de
Reviewed-by: Martin Smith <martin.smith@digia.com>
2015-11-16 15:26:11 +00:00
Nico Vertriest
90c81366d1 Doc: added specs to setHorizontalHeaderItem()
Added that adding an item deletes an existing one

Task-number: QTBUG-42105
Change-Id: Ibcf08e6e2bf9c9239e7eca5aa48f2f30c8417fec
Reviewed-by: Martin Smith <martin.smith@digia.com>
2015-11-16 15:26:04 +00:00
Nico Vertriest
50f91545a3 Doc: removed 2 invalid external links in external resources.
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>
2015-11-16 15:25:56 +00:00
Nico Vertriest
c81fcffed8 Doc: Corrected minor typo
Task-number: QTBUG-27499
Change-Id: I20b8da6300b84a107f6f581b99c63a39f8455d6c
Reviewed-by: Martin Smith <martin.smith@digia.com>
2015-11-16 15:25:47 +00:00
Nico Vertriest
5c4c5dd7a2 Doc: corrected snippet QSqlTableModel
Wrongly used QSQLQueryModel previously

Task-number: QTBUG-35860
Change-Id: I059ba45e54ac67b75b68eb0b804f66642b87a29f
Reviewed-by: Martin Smith <martin.smith@digia.com>
2015-11-16 15:25:35 +00:00
Oswald Buddenhagen
5292dbc595 remove pointless conditional defines
wince triggers the functionally identical cross_compile scope above.

Change-Id: I92cdbb1df51599b2b4aa8a7ca2f3d6407034ba26
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:40:20 +00:00
Oswald Buddenhagen
778e6de8a2 move addition of libdl to right project
Change-Id: Ifae8b906ef3767d9c21f09953076bd640829858f
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-11-16 14:40:27 +00:00
Oswald Buddenhagen
79cdc7a26c remove abuse of module include path overrides
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>
2015-11-16 14:40:24 +00:00
Konstantin Ritt
e593e5aa67 QChar: Simplify case convertion code with template magic
Same as in QString, though simpler a bit due to fixed-length sequence.

Change-Id: Idd6670a7b6415f5d515987c30931d16b73dd280e
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-11-16 14:34:13 +00:00
Konstantin Ritt
c267646867 Move CasexTraits from qstring.cpp to qunicodetables_p.h
and implement TitlecaseTraits as well,
to be re-used in the following commit.

Change-Id: I5c0bff42fe3b9bc9c2454cc16916cc2be87f604f
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-11-16 14:34:04 +00:00
Konstantin Ritt
4d5b57825a QFontEngineFT: Optimize format convertion code with template magic
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>
2015-11-16 14:33:51 +00:00
Konstantin Ritt
6a7155997b QFontEngineFT: Revise the legacy LCD filter implementation
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>
2015-11-16 14:33:37 +00:00
Eskil Abrahamsen Blomfeldt
a856c4a902 Fix falsely reported style for fallback font
In change 8f6b328410 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>
2015-11-16 14:33:23 +00:00
Tor Arne Vestbø
96cebb46c2 OS X: Don't forward key events to popup window if it's a tooltip
676edc006e 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>
2015-11-16 14:26:44 +00:00
Tor Arne Vestbø
2f9effeb64 Fix OS X 10.11 (Xcode 7.1) build issues due to strongly typed enums
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>
2015-11-16 14:26:43 +00:00
Friedemann Kleint
3d6975af4b Compile minimalegl QPA plugin on Windows/WinRT.
Add event dispatchers.

Change-Id: I548b50d1ec648fa8cb6c77881c95125f361343f0
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-11-14 18:22:29 +00:00
Friedemann Kleint
08a4b7f745 Windows: Move GUI event dispatcher to QtPlatformSupport.
This makes it possible to reuse it for the minimalegl QPA plugin.

Change-Id: I1c3dbaf67f32294a5d0e03cc1eb8557049b810a5
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-11-14 18:22:01 +00:00
Frederik Gladhorn
8ff36d4897 Install fixqt4headers.pl script
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>
2015-11-14 12:46:50 +00:00
Maurice Kalinowski
9020bdcc33 winrt: Launch application on Windows 10 Mobile final
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>
2015-11-14 10:26:21 +00:00
Timur Pocheptsov
d29fbbd6eb Make CoreFoundation event dispatcher available on OS X also
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>
2015-11-13 21:38:31 +00:00
Friedemann Kleint
10d311d9d2 Windows/Direct2D: Handle screen changes after window creation.
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>
2015-11-13 21:24:34 +00:00
Konstantin Ritt
26e66694fa QFontEngineFT: Minor optimization to convertGRAYToARGB()
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>
2015-11-13 20:43:27 +00:00
Konstantin Ritt
c1da13f6db QTextEngine: Apply CoreText specific post-processing for QFE::Mac only
These tricks has no meaning to other font engines (i.e. to FreeType).

Change-Id: I0410693d4d159367d760433062506691dc7c4610
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-11-13 20:43:13 +00:00
Konstantin Ritt
50af66293d QTextEngine: Do not disable graphite2 HB shaper backend
This fixes-up bf013c9e74 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>
2015-11-13 20:43:10 +00:00
Konstantin Ritt
2316db05a8 QFontEngine: Check for AAT support only with HB-NG
HB-old is unable to handle these anyways.

Change-Id: Ibe69b5d030134b8a0a76dc966b6dfc6b5ff9a883
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-11-13 20:43:06 +00:00
Konstantin Ritt
3a3e2193d7 QUnicodeTables generator: Minor clean-up & stricter checks
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>
2015-11-13 20:42:20 +00:00
Konstantin Ritt
0f336e8565 Introduce png_dependency.pri
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>
2015-11-13 20:42:12 +00:00
Nico Vertriest
037b05ac76 Doc: corrected error in doc static plugins
Task-number: QTBUG-43160
Change-Id: I94f92318cec095391050b2af90980010bd1066b9
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
2015-11-13 20:33:44 +00:00
Frederik Gladhorn
a31b4e93cb Blacklist tst_qfontdialog::setFont on RHEL 6.6
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>
2015-11-13 20:31:55 +00:00
Frederik Gladhorn
d201dd701e Blacklist tests that fail with Gtk style on RHEL 6.6
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>
2015-11-13 20:31:18 +00:00