Commit Graph

29142 Commits

Author SHA1 Message Date
Oswald Buddenhagen
615616b069 add some unix-specific options understood by configure.exe
it's really a bit weird that the windows configure has more options to
configure unix features than the unix one, even if some are just
workarounds for missing auto-detection.

unlike in configure.exe itself, -posix-iconv is now also understood for
symmetry with -gnu-iconv and -sun-iconv.

Change-Id: Ic15376e5822e43b998bd17f02c11e5dd0567dc2b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:05:55 +00:00
Oswald Buddenhagen
0a434cc00f add missing 'disable' fields to {sun,gnu}-libiconv features
Change-Id: Ieed30c1cf388157c47c8a58979b8c214223d351a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:05:45 +00:00
Oswald Buddenhagen
30cac3ed2d refactor the configure help output
- remove the redundantly listed -no-* options and indicate the defaults
  differently
- completely regroup the options into somewhat logical sections

Change-Id: Iaa87c2f3749944cd3fc2ec18975767c04892f746
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:05:41 +00:00
Lars Knoll
c41dd40bff Fix ssl handling in configure to be compatible with configure.exe
Change-Id: I0fdd3aebaa9d2a4c68ee6ebc0b7a24868f3c2aa5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-11 08:05:37 +00:00
Oswald Buddenhagen
e23471abc0 fix quoting in the basic qmake command construction
... and refactor it to make it less scary.

note that "qmake_args" now basically means "qmake + args".

Change-Id: Ifa5b756642de95e2aadf01606d936ea1d7a18210
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:05:27 +00:00
Oswald Buddenhagen
b093aec1d1 don't use error() for user errors, take 2
missed configure.pri previously.

Change-Id: Ie642526a830ca6471d3f92507c7b22c812db0d86
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:05:05 +00:00
Oswald Buddenhagen
622ab0aca5 use qtLog() to also print command output
Change-Id: I950bc86b0b2dafcb8f2369478f391dc05280194f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:04:59 +00:00
Oswald Buddenhagen
f18cc7e3cc fix configure qtLog()
its actual function was qtLogCommand(), but all callers outside
configure_base.prf apparently didn't know that. adjust implementation.

Change-Id: I910d4ba33c6f31debc81c37e3bfff1a288190355
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:04:55 +00:00
Oswald Buddenhagen
615b9c1f06 make sure that we capture the entire test command's output
the command can be a compound statement (usually 'foo && bar' style),
so enclose it in parens before redirecting stderr.

Change-Id: Ib72a2c8ddfd17bf9457e9cfe2652121258ce9a64
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-11 08:04:44 +00:00
Oswald Buddenhagen
46cb5a4dce make it impossible to lie about the feature an output belongs to
overriding an output's 'feature' field would just lead to confusing
error messages. the right way is setting the 'name' field.

adjust the 'dbus' library output to this policy.

Change-Id: I912133f3a0a50fc55f2e16a1ed6bfa464aae8d88
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:29 +00:00
Oswald Buddenhagen
4f8b40d74e make the egl-viv and egl-brcm config tests less convoluted
don't mix in gles2 stuff, and rely on the library definitions from the
mkspec.

Change-Id: Id81b27a8c4f24729866d3ceb5cf97b443def542c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:25 +00:00
Oswald Buddenhagen
1e6b403ecc restore lost egl-mali-2 test
Change-Id: I6e9e8244768d7e702a8a20ed18f5f0293dfefead
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:20 +00:00
Oswald Buddenhagen
337ce2fa68 rename the eglfs-* tests
the test names should be about the dependency, not the purpose.

Change-Id: I6e45f4caa36e6c6a9e62092416bcab89893db3d2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:16 +00:00
Oswald Buddenhagen
9945763cab remove redundant x11 handling
one of the effects of CONFIG+=x11 is LIBS+=$$QMAKE_LIBS_X11, so it's
positively pointless for project files to do the same.

Change-Id: I4085acd6254401897b34e131c2cb57f1f76a3638
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:11 +00:00
Oswald Buddenhagen
d520c825f1 delete orphaned config tests
mitshm, xcursor, xfixes, xrandr, xshape, and xsync were dead for a long
time (see also 4cb795cbdb).
glxfbconfig was also dead (see also d54b77d55).
x11/notype and x11/xkb became dead in 4535913c4f.
javascriptcore-jit became dead in 24f1025663.
stdint was another webkit vestige (see also 1b716724f7).

Change-Id: I04f408cb917c767951645c6445f15f24378fa43a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:06 +00:00
Oswald Buddenhagen
08f6545dcb fix over-quoting of OPENSSL_LIBS and QT_HOST_CFLAGS_DBUS
we pass the pre-quoted value directly to the output function, which
adds another layer of quoting. to avoid over-quoting, introduce the
'eval' attribute which sends the value through eval() first, thus
removing the extra quoting.

Change-Id: Ic63a50cb7eccc61b0f730476e124339aeb95586c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:43:02 +00:00
Oswald Buddenhagen
bcd0653e10 fix exit paths when pkg-config is not found
while the previous code actually worked, it's probably more or less
coincidence that running "false" produces the correct result.

Change-Id: Ib332bd6789ac7188570ba1af4676494b4e2c9d8c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:57 +00:00
Oswald Buddenhagen
472332559a fix use_gold_linker not being used by compile tests
Change-Id: Ib43ddb5174fd2d9b45f3c1a3e6d90f2b8f0dddd1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:50 +00:00
Oswald Buddenhagen
9987b1dc69 platform-scope the test executables the arch test is looking for
this is clearer, and avoids potential false hits if the target OS
is changed without cleaning the build dir first.

Change-Id: If88f3c555740dc9ff559c172b4b005ed8bfb60ae
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:45 +00:00
Oswald Buddenhagen
52b3a81865 don't distclean before every compile test run in non-clean build dir
due to gmake's Makefile auto-rebuild feature, the distclean would
typically invoke qmake. overall, the step would almost double the run
time of each compile test.

instead, just clean between the regular qmake and make steps. this
deletes the object file the test executable depends on, so this is
sufficient to trigger a full rebuild.

Change-Id: If8e254e172dd169e31fd606d9ef31d9a14f670d8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:40 +00:00
Oswald Buddenhagen
a4e1bc5b13 fix 'test' field checking in qtConfOutput_library()
Change-Id: I7cfcc33e188713f32d31e023999f5059c0bd05b1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:33 +00:00
Oswald Buddenhagen
0eff800e81 add support for returning the command's exit status to $$system()
... and make use of it in qtRunLoggedCommand().

Change-Id: I242dfde344f555800cef1f55d3cb85418a93277f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:29 +00:00
Oswald Buddenhagen
62838f07d4 fix handling of multi-token fields in config test definitions
standardize on the fields in the json structure being single strings in
which separate elements are quoted and space-joined (because quoting
is unlikely to be necessary in the json file itself, and this format
avoids the visual noise of array handling).

the quoting itself is expected to be qmake-compatible, which is assumed
to be the case for the output of pkg-config (it's actually shell-quoted,
but that's the same except in some not-so-relevant corner cases).

Change-Id: Icc1d7abc02c449fa759d9714bc5e56e2b8809585
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:23 +00:00
Oswald Buddenhagen
53e06e68b6 fix passing arguments with spaces to configure -D/-I/-L/-F
Change-Id: Ic03e487e5988fa38246975b52d1494af58ccb22f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:17 +00:00
Oswald Buddenhagen
865d80fdb5 remove workarounds for spurious function argument inheritance
the qmake bug has been fixed recently.

Change-Id: I4a4226b3cd77d449980f73e41cd256ed43940a09
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-10 15:42:12 +00:00
Oswald Buddenhagen
c1ad0c2ebf Fix QZip autotest and enable QZip and QTextOdfWriter tests again
don't refer to non-existent feature 'OdfWriter', and test these
classes if we have a developer build.

Change-Id: I59b0d4bbba4958ed3bd76f504cd8b493dbd7f877
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-10 15:42:01 +00:00
Olivier Goffart
5699530758 Add a benchmark for QReadWriteLock
Results on current dev branch [955b2bdfc0]:

thread count: 4
********* Start testing of tst_QReadWriteLock *********
Config: Using QtTest library 5.8.0, Qt 5.8.0 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 6.1.1 20160707)
PASS   : tst_QReadWriteLock::initTestCase()
PASS   : tst_QReadWriteLock::uncontended(nothing)
RESULT : tst_QReadWriteLock::uncontended():"nothing":
     1,113,292.1 CPU ticks per iteration (total: 11,132,922, iterations: 10)
PASS   : tst_QReadWriteLock::uncontended(QMutex)
RESULT : tst_QReadWriteLock::uncontended():"QMutex":
     35,490,310.7 CPU ticks per iteration (total: 354,903,108, iterations: 10)
PASS   : tst_QReadWriteLock::uncontended(QReadWriteLock, read)
RESULT : tst_QReadWriteLock::uncontended():"QReadWriteLock, read":
     40,513,695.0 CPU ticks per iteration (total: 405,136,950, iterations: 10)
PASS   : tst_QReadWriteLock::uncontended(QReadWriteLock, write)
RESULT : tst_QReadWriteLock::uncontended():"QReadWriteLock, write":
     43,179,327.2 CPU ticks per iteration (total: 431,793,272, iterations: 10)
PASS   : tst_QReadWriteLock::uncontended(std::mutex)
RESULT : tst_QReadWriteLock::uncontended():"std::mutex":
     37,733,243.0 CPU ticks per iteration (total: 377,332,430, iterations: 10)
PASS   : tst_QReadWriteLock::uncontended(std::shared_timed_mutex, read)
RESULT : tst_QReadWriteLock::uncontended():"std::shared_timed_mutex, read":
     71,517,438.7 CPU ticks per iteration (total: 715,174,388, iterations: 10)
PASS   : tst_QReadWriteLock::uncontended(std::shared_timed_mutex, write)
RESULT : tst_QReadWriteLock::uncontended():"std::shared_timed_mutex, write":
     69,967,867.5 CPU ticks per iteration (total: 699,678,676, iterations: 10)
PASS   : tst_QReadWriteLock::readOnly(nothing)
RESULT : tst_QReadWriteLock::readOnly():"nothing":
     479,393,335.3 CPU ticks per iteration (total: 4,793,933,354, iterations: 10)
PASS   : tst_QReadWriteLock::readOnly(QMutex)
RESULT : tst_QReadWriteLock::readOnly():"QMutex":
     823,493,383.2 CPU ticks per iteration (total: 8,234,933,832, iterations: 10)
PASS   : tst_QReadWriteLock::readOnly(QReadWriteLock)
RESULT : tst_QReadWriteLock::readOnly():"QReadWriteLock":
     559,816,053.6 CPU ticks per iteration (total: 5,598,160,536, iterations: 10)
PASS   : tst_QReadWriteLock::readOnly(std::mutex)
RESULT : tst_QReadWriteLock::readOnly():"std::mutex":
     961,903,416.3 CPU ticks per iteration (total: 9,619,034,164, iterations: 10)
PASS   : tst_QReadWriteLock::readOnly(std::shared_timed_mutex)
RESULT : tst_QReadWriteLock::readOnly():"std::shared_timed_mutex":
     1,786,254,363.5 CPU ticks per iteration (total: 17,862,543,636, iterations: 10)
PASS   : tst_QReadWriteLock::cleanupTestCase()
Totals: 14 passed, 0 failed, 0 skipped, 0 blacklisted, 44507ms
********* Finished testing of tst_QReadWriteLock *********

Change-Id: I42189f7a356dcb36378e9d54111b7fbe89e62402
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-08-10 09:05:14 +00:00
Laszlo Agocs
9981f521d9 libinput: Fix high dpi scaling support
Bring it onto the level of evdevtouch.

Task-number: QTBUG-55182
Change-Id: Iaba58234fa6289870d60f0fcc351d4b97655f3e2
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-10 09:05:06 +00:00
Laszlo Agocs
e9fe0a15a8 eglfs: Fix rotation support with the DRM backends
The change in QEglFSScreen::geometry() was not reflected in the
advanced backends that subclass it.

Change-Id: I6494a96f0b9afaea3722c61035d4b46bf2473897
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-10 09:05:03 +00:00
Laszlo Agocs
9ab5c329bf eglfs: Add basic support for controlling how the virtual desktop is formed
Choose between horizontal (default) and vertical.

Task-number: QTBUG-55188
Change-Id: Ibc490b0ad8c60b66db785455c57987eb8afdad0d
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-10 09:04:54 +00:00
Laszlo Agocs
7de7f981dc eglfs: Add physicalWidth and height overrides to KMS config
Task-number: QTBUG-55188
Change-Id: I751b8c3c4b6f7a33b08ec23fd16cd025a5792ba6
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-10 09:04:51 +00:00
Laszlo Agocs
b305702d1e eglfs: Support virtual desktops in the OpenGL cursor
The GBM-based hardware cursor already has this. Let's implement it
in the commonly used OpenGL cursor too. The main user will be the
EGLDevice backend which does not currently have a hardware cursor
but supports multiple screens.

This also means QEglFSCursor must be capable of operating on different
contexts (and what's more, non-sharing contexts).

Task-number: QTBUG-55161
Change-Id: Ie23bba1e6aab34b04d689f26a84c19a2bde518da
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-10 09:04:47 +00:00
Laszlo Agocs
e930425228 eglfs: Fix QT_QPA_EGLFS_ROTATION with the KMS/DRM screeen
It overrides geometry().

Change-Id: I93c607567d7cb688221d200dcd47c1a6ba23b26b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-10 09:04:42 +00:00
Laszlo Agocs
af7b4e3f55 eglfs: Enable virtual desktop with EGLDevice as well
Not clear why separateScreen was overridden to true. The GBM-based backend
goes with the default of false, leading to setting up the screens as virtual
siblings and reporting the correct virtual desktop geometry.

The difference currently lies in the OpenGL mouse cursor, which, unlike the
GBM hardware cursor, does not yet support virtual desktops. Its behavior
is not affected of the flag however.

Task-number: QTBUG-54151
Task-number: QTBUG-55161
Task-number: QTBUG-55188
Change-Id: I888ffc43ed4add66065a2f7c606c9b3a2d56a9ab
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
2016-08-10 09:04:38 +00:00
Kai Koehne
c8afc67875 Automatically generate code attribution documentation
Let the qtattributionsscanner tool generate a .qdoc file in
the build directory that contains code attributions for
this qdoc module.

Task-number: QTBUG-55139
Change-Id: Ic7532c9a7c092f552c36e21ee6cbebdd0107689b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-08-10 06:11:18 +00:00
Liang Qi
2579fe7bfd Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev 2016-08-09 16:00:53 +00:00
Liang Qi
22e96c4d34 Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f
2016-08-09 17:59:51 +02:00
Maurice Kalinowski
39def876a6 winrt: update tests
Update due to behavior differences between win32 and winrt.

Change-Id: I39532de98c25cd67da49cbb20d42dccc803f1805
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-08-09 15:58:12 +00:00
Maurice Kalinowski
bd79c4e28c winrt: Make test functional
The adoptedThreads test never spawned any thread causing a test error
later on. Hence add a winrt version using __beginthreadex which exists
for that platform.

Change-Id: I04f980218713df20cb41d804d732e0c99b958489
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-08-09 12:13:23 +00:00
Ulf Hermann
fa95eb0554 QHeaderView: Reset lastSectionLogicalIdx on clear()
Otherwise we can fail to stretch the last section when adding new
sections.

Task-number: QTBUG-52446
Change-Id: I7eb5267ac500bf4246e57c3e3a43268bb65ef1f7
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
2016-08-09 08:08:30 +00:00
Marc Mutz
7305b3e828 QNetworkManagerEngine: port away from Java-style iterators
They are slower, more annoying, and not safer than
their STL counterparts.

Port to C++11 range-for, or to "auto it, end" for
loops in cases where the key was also accessed.

Change-Id: Ib27608ddbe9c0775092a1c6495731ad324727d3e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-09 07:12:57 +00:00
Marc Mutz
3400e7ee7f QNetworkManagerEngine: add override keywords
Change-Id: Ie926119ee58d330e415634f93eb334c6befeede1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-09 07:12:52 +00:00
Marc Mutz
ccfd699b85 QNetworkManagerEngine: fix const-correctness
Change-Id: I058617315e7cf2c6fa49f1ed0d16cb5e2a78dd72
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-09 07:12:47 +00:00
Marc Mutz
4101ecdb0e QColor: mark as movable (except for QList)
Unbelievable that this has survived for so long...

Change-Id: Icff6ecc56de773fa6054d5b96e421299a48bdbde
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-08-09 07:11:35 +00:00
Thiago Macieira
6f275a4beb Make sure QDBusConnection::connect() returns false if already connected
QDBusConnection::connect() behaves like QObject::connect with a
connection type of Qt::UniqueConnection | Qt::QueuedConnection. So
return false if it's already connected.

[ChangeLog][QtDBus][QDBusConnection] Fixed a bug that would cause
QDBusConnection::connect() to return true if a slot was already
connected to the same D-Bus signal. QtDBus does not support multiple
connections.

Change-Id: I87e17314d8b24ae983b1fffd1453aef5a7c9ad0b
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-08-09 02:41:22 +00:00
Thiago Macieira
e24f89f266 Fix build with clang-cl and the Intel compiler on Windows
Neither clang-cl nor the Intel compiler are able to parse the MSVC code
in a constexpr environment. For Clang, we can just use the __builtin
functions, which it does make available on Windows. For the Intel
compiler, there's no alternative, so we just don't use the _BitScanXxx
functions. It will produce slower code, though.

qalgorithms.h(587,19) :  error: variables defined in a constexpr function must be initialized
qalgorithms.h(635,12) :  note: non-constexpr function '__popcnt' cannot be used in a constant expression

etc.

Change-Id: I149e0540c00745fe8119fffd14627ded43807000
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-08-09 02:41:19 +00:00
J-P Nurmi
30eecdf6d8 Fix QGtk3Menu::removeMenuItem()
The if-condition was broken, so items weren't removed from
the container as appropriate. Accessing such dangling items
caused a crash later on exit.

Task-number: QTBUG-54432
Task-number: QTBUG-54462
Change-Id: I98fd9f29a93d72e3e4a8f0fb6bac40ad4728ba6f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-08 14:14:31 +00:00
Rainer Keller
a8390bb197 Doc: Fix saturation graphic for HSV color model
The text is correctly describing the gradient from gray to blue but the
picture shows white to blue.  Additionally including the SVG sources for
creating the pictures.

Change-Id: I608a239f4de9c2d3761196c44db024cc31ce441a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-08-08 12:26:08 +00:00
Laszlo Agocs
4da9972e89 Add -opengl es2 to the DRIVE CX configure example
To make sure it does not end up picking the desktop OpenGL implementation
from Mesa that may be present in the sysroot.

Change-Id: I815eb7d2664f9e62d620acf8260cae40f83dfaf8
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-08-08 09:53:18 +00:00
Oswald Buddenhagen
815a41f714 make use of silent error() emission
get rid of the entirely superfluous stock "Aborting." messages -
the event triggering the exit has already reported the problem.

Change-Id: Ib9dfb9e4212f60eceb2ea432cdf56c5a8afe9d65
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-08 09:48:41 +00:00