Commit Graph

238 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
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
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
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
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
ae190c24a0 fix enable/disable of -xkb-common-x11
Change-Id: I2d0b7a8ed2f30422cb1af2cac8dca0e718509021
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-08 09:48:29 +00:00
Edward Welbourne
f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
2016-08-01 18:20:00 +02:00
Laszlo Agocs
a89875cd69 Fix names of eglfs features
Change-Id: I0f43eea2ebc0dff945801c893302807bb71bc5d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-29 07:21:01 +00:00
Laszlo Agocs
4940194a35 Use pkg-config for RPi EGL detection
The config test for eglfs-brcm would fail otherwise on modern Yocto-based
sysroots, as these have no /opt/vc, but have a proper egl.pc that has the
include path and libs.

Task-number: QTBUG-50838
Change-Id: Ibe8dcfbfe9aabe00fd8c040e6e41a4479ccb39bb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-29 07:20:58 +00:00
Laszlo Agocs
c8f29602d6 Add missing configure status reporting for eglfs-brcm
Change-Id: I05031b3170b922db17387e94a18a52879f3362f9
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-29 07:20:53 +00:00
Alex Trotsenko
75a9bd2a4f Introduce SCTP sockets support
Add protocol-specific code and the QSctpServer, QSctpSocket classes.

Change-Id: Ie9a1d87bd1fda866a2405043d1c15c12ded5a96e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-07-27 06:37:24 +00:00
Mike Krus
e7aec5302e Use earlyReport to handle incorrect use of RPATH config settings
Report error when using RPATH settings on platforms that don’t support
it or when doing static builds

Change-Id: I2ba0c2bff5347170c7fcb339da80ef1f1974d43a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-26 13:34:09 +00:00
Mike Krus
a8cf3b0257 Extend tests in new json config file to cover UIKIT platforms
Replace ios tests with uikit to include tvos

Change-Id: Ifc67d556a2b3b24532d0f87b12599420f895ddbd
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-07-25 06:57:31 +00:00
Oswald Buddenhagen
5ad32e7f77 make use_new_dtags a linux-only feature
it's the only OS with braindead "old" dtags in the first place.

Change-Id: I0fba436ff3f9fc061c1741b1899ca133b8ad6b5e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:28:11 +00:00
Oswald Buddenhagen
b451a6e514 make 'feature' report type always use the feature descriptions
they are really meant for pretty-printing the summary in the first
place, and were previously unused when this type was invoked explicitly
(because of using a condition).
adjust the neon/mips_dsp/mips_dspr2 descriptions to match the context
and remove the now redundant "message" fields.

Change-Id: I08558f342a0d9189a37145085e5470f91a9d0881
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:28:03 +00:00
Oswald Buddenhagen
2b78a49f22 make firstAvailableFeature report type use the feature descriptions
they are really meant for pretty-printing the summary in the first
place, and were previously unused for this type.
adjust the c++* descriptions to match the context.

Change-Id: I2a76b5651892bf9bd6fec315e446bfdb7c3aee97
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:28:00 +00:00
Oswald Buddenhagen
caf51ee0dd make featureList report type use the feature descriptions
they are really meant for pretty-printing the summary in the first
place, and were previously unused for this type.
adjust the sse/avx/avx512 descriptions to match the context.

Change-Id: Icf514718355c6ccd608d825b70296cc0383dbfe8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:27:56 +00:00
Oswald Buddenhagen
8cbf2aee75 add missing "enable" fields to opengl features
this ensures that we complain if desktop gl or gles2 is explicitly
requested but not available.

Change-Id: Iad068ef34cdf9353cb483d4dc667ddd85ded740d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:27:52 +00:00
Oswald Buddenhagen
e9d822943a add missing "enable" field to openssl feature
this ensures that an explicitly requested linked/runtime support is
complained about when the test fails. the old configure would do that as
well.

Change-Id: I7f235fa7df5e5d53938de0e32b07536447b8d1d4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:27:48 +00:00
Oswald Buddenhagen
78872375c2 unify openssl options with the d-bus ones
introduce -openssl-runtime and -openssl [no|yes|linked|runtime] for
consistency with the respective dbus options.

Change-Id: I061b46b52b3132ead4332b33f7a60d6fe0e73ab9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:27:44 +00:00
Oswald Buddenhagen
92e7f15277 simplify conditions of dbus-linked feature
... by chaining it to the dbus feature, as is done for openssl/-linked.

Change-Id: Id1f9f761914c356d2a0056aa80213954dce3403d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:27:41 +00:00
Oswald Buddenhagen
be3b2de87f accept plain -dbus option
the feature's logic is already prepared for that.

Change-Id: Ieb0131904b532409fc01bafca9f85fb22039a68a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-22 10:27:38 +00:00
Lars Knoll
091df96fb8 Reimplement compiler default detection
Change d1b09dba45 removed the
support to detect the C++ version the compiler used by
default. In essence, it forced the compiler in C++11 mode,
if the default was still C++98.

This change reimplements the functionality in the new
configuration system.

Change-Id: Ib4bf7ade85288776f9ae2a870f19764df727e0a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-15 10:11:01 +00:00
Lars Knoll
6f1ad48a91 Remove -fw and -l command line arguments
These arguments were nonsensical, as they would lead to every single Qt
module linking to those libraries. This was probably some left-over from
old times, when Qt was just a single library.

Change-Id: I0343a6df270fd0d2efa5333ba4e457670f5d0910
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-13 19:51:17 +00:00
Oswald Buddenhagen
4a52b5cb33 fix command line option for avx512
we need to map it to the avx512f feature.

Change-Id: I565b5bd256003aa6f80180b0e06c04bad8ea68af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-08 13:03:13 +00:00
Lars Knoll
a15b9d3910 Fix compile-examples command line option
Map it to the correct feature name.

Change-Id: I7e2128e66a575ae7e562018b766d25f85c64c961
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-08 13:03:02 +00:00
Lars Knoll
8ca247e287 Get rid of the qt_no_framework setting in the CONFIG variable
It's only used in one place, where it's actually not required either.

Change-Id: I5766d2b5f0c1083bbd58a9b9fb07cc67bbd46a94
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-05 15:48:58 +00:00
Lars Knoll
98526119c6 Handle the -[no]make command line arguments in qmake
Change-Id: I979f648b4301152e4a13ffe90aa05d9ded8556c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-02 06:18:55 +00:00
Lars Knoll
e9ba9609f1 Determine the set of modules to skip in qmake
Change-Id: I421f50e5944962eae41700180ee49a916a2a023d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-02 06:18:48 +00:00
Lars Knoll
c167308c5d Fix handling of -v/-verbose command line flags to configure
This is not a feature that should get propagated to other
configure runs, so simply hardcode support for it.

Change-Id: Ieb1c33243154b3583e91061d3592d7e87c36f402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-02 06:18:40 +00:00
Lars Knoll
3114237877 Call arch test through the new qmake based configure system
Detect host and target architecture from within qmake, and set
QT_ARCH accordingly.

Change-Id: I30255f88c7645d197bd07355a1dff02b377cbbe8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-02 06:18:32 +00:00
Liang Qi
200fdd96f0 Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	configure
	configure.json

Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
2016-07-01 13:21:29 +02:00
Lars Knoll
cb260c6c7f Harmonize directwrite handling between the configures
There is a config test for DirectWrite we should run, so
use that instead of autoDetect=false in the new system.
Also, don't add the feature to the CONFIG variable in
configure.exe, as it's not used that way anyway.

Change-Id: I9266ccda8405adce765eac8f0435d723c6bc6f1f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-01 07:32:12 +00:00
Allan Sandfeld Jensen
29ac40d6cd Correct framework config options to remain as they used to
Commit 90eee08b3e changed how framework
config was defined, subtlely breaking Qt framework builds.

Task-number: QTBUG-54361
Change-Id: Ie7670d900d9eb4c2adb52ca1cd0f60f22acf8b81
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-27 14:39:22 +00:00
Lars Knoll
921df719dc Correctly set simulator_and_device in ios builds
A small logic error that sneaked in during the porting of configure.
We actually want simulator_and_device to be set if input.sdk is
empty, not the other way round.

Change-Id: I8f729fbc48617618f981c70887bd4400e0b2a0c3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-24 12:29:07 +00:00
Lars Knoll
90eee08b3e Let qmake do most of the work of configuring Qt
Command line arguments, configure tests and features are now
defined in a json file and a configure.pri containing some
custom functions.

qmake uses the json file to determine command line arguments,
tests and features to be executed at configuration time.

A new qt_configure.prf contains all the infrastructure to parse
the command line, run the configure tests, determine the set of
available features and create a report about it.

Change-Id: If30ac089dd3e9f8c67ebd642bde10cfa960893bb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-22 14:19:35 +00:00