summaryrefslogtreecommitdiffstats
path: root/configure.json
Commit message (Collapse)AuthorAgeFilesLines
* rewrite library handling in configureOswald Buddenhagen2016-08-181-519/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, each library was distributed over a test and (optionally) a 'library' output of a feature. this was conceptually messy and limiting. so instead, turn libraries into a category of their own. libraries now support multiple properly separated sources, which makes overriding them a lot saner. sources can be conditional to accommodate platform differences. as an immediate consequence, move (almost) all library references from the config test projects to the json file. a few tests were excluded, because they are doing somewhat magic things that should not be handled in this bulk change: - freetype: .pri file shared with actual source code - clock-gettime: -lrt is conditional, and there is a .pri file which is shared with actual source code - ipc_posix: -lrt & -lpthread conditional - iconv: -liconv conditional the multi-source mechanism is used to make a variety of tests work on windows, where the library name differs from unix (and sometimes between build configurations). some tests still needed minor adjustments to actually work. on the way, fix up disagreements between manually specified libraries and pkg-config lines (affecting several xcb-related tests). Change-Id: Ic8c58556fa0cf8f981d386b13ea34b4431b127c5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* fix name of stack-protector-strong featureOswald Buddenhagen2016-08-181-1/+1
| | | | | | | dashes, not underscores. Change-Id: I51db3a5475ebf8dfe85e447baffafba225476967 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* don't implicitly test for kms in egldevice test any moreOswald Buddenhagen2016-08-181-1/+1
| | | | | | | | | | | having compound tests is messy, and we already have a separate test for that anyway. the kms test itself gains a fallback library, as that's what both the egldevice test did and the actual projects using kms do. Change-Id: I4544b64de86d58d6c6449bc0ad9095acaf144056 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* get rid of test type 'shell'Oswald Buddenhagen2016-08-121-9/+6
| | | | | | | | | | | | it's bound to the bourne shell, which is not readily available on windows hosts. on the way, the pch, fvisibility, and bsymbolic_functions tests were rewritten as regular compile tests. they now just verify that qmake's built-in support for the tested features actually works. Change-Id: Ibac246f21b5ececa40da3f576dc789982eaf9fdf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* add some unix-specific options understood by configure.exeOswald Buddenhagen2016-08-111-6/+17
| | | | | | | | | | | | 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>
* add missing 'disable' fields to {sun,gnu}-libiconv featuresOswald Buddenhagen2016-08-111-0/+2
| | | | | Change-Id: Ieed30c1cf388157c47c8a58979b8c214223d351a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix ssl handling in configure to be compatible with configure.exeLars Knoll2016-08-111-0/+3
| | | | | | Change-Id: I0fdd3aebaa9d2a4c68ee6ebc0b7a24868f3c2aa5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* make it impossible to lie about the feature an output belongs toOswald Buddenhagen2016-08-101-1/+1
| | | | | | | | | | 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>
* restore lost egl-mali-2 testOswald Buddenhagen2016-08-101-1/+6
| | | | | Change-Id: I6e9e8244768d7e702a8a20ed18f5f0293dfefead Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* rename the eglfs-* testsOswald Buddenhagen2016-08-101-8/+8
| | | | | | | the test names should be about the dependency, not the purpose. Change-Id: I6e45f4caa36e6c6a9e62092416bcab89893db3d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* fix over-quoting of OPENSSL_LIBS and QT_HOST_CFLAGS_DBUSOswald Buddenhagen2016-08-101-2/+2
| | | | | | | | | | 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>
* fix enable/disable of -xkb-common-x11Oswald Buddenhagen2016-08-081-1/+2
| | | | | Change-Id: I2d0b7a8ed2f30422cb1af2cac8dca0e718509021 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-011-11/+0
| | | | | | | | | | | | | | | | | | | | | | | 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
* Fix names of eglfs featuresLaszlo Agocs2016-07-291-8/+8
| | | | | Change-Id: I0f43eea2ebc0dff945801c893302807bb71bc5d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Use pkg-config for RPi EGL detectionLaszlo Agocs2016-07-291-1/+2
| | | | | | | | | | 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>
* Add missing configure status reporting for eglfs-brcmLaszlo Agocs2016-07-291-1/+1
| | | | | | Change-Id: I05031b3170b922db17387e94a18a52879f3362f9 Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Introduce SCTP sockets supportAlex Trotsenko2016-07-271-0/+13
| | | | | | | Add protocol-specific code and the QSctpServer, QSctpSocket classes. Change-Id: Ie9a1d87bd1fda866a2405043d1c15c12ded5a96e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use earlyReport to handle incorrect use of RPATH config settingsMike Krus2016-07-261-8/+11
| | | | | | | | 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>
* Extend tests in new json config file to cover UIKIT platformsMike Krus2016-07-251-3/+3
| | | | | | | Replace ios tests with uikit to include tvos Change-Id: Ifc67d556a2b3b24532d0f87b12599420f895ddbd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make use_new_dtags a linux-only featureOswald Buddenhagen2016-07-221-2/+6
| | | | | | | it's the only OS with braindead "old" dtags in the first place. Change-Id: I0fba436ff3f9fc061c1741b1899ca133b8ad6b5e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make 'feature' report type always use the feature descriptionsOswald Buddenhagen2016-07-221-9/+3
| | | | | | | | | | | 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>
* make firstAvailableFeature report type use the feature descriptionsOswald Buddenhagen2016-07-221-3/+3
| | | | | | | | | 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>
* make featureList report type use the feature descriptionsOswald Buddenhagen2016-07-221-16/+16
| | | | | | | | | 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>
* add missing "enable" fields to opengl featuresOswald Buddenhagen2016-07-221-0/+2
| | | | | | | | 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>
* add missing "enable" field to openssl featureOswald Buddenhagen2016-07-221-0/+1
| | | | | | | | | 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>
* unify openssl options with the d-bus onesOswald Buddenhagen2016-07-221-1/+2
| | | | | | | | 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>
* simplify conditions of dbus-linked featureOswald Buddenhagen2016-07-221-3/+2
| | | | | | | ... by chaining it to the dbus feature, as is done for openssl/-linked. Change-Id: Id1f9f761914c356d2a0056aa80213954dce3403d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* accept plain -dbus optionOswald Buddenhagen2016-07-221-1/+1
| | | | | | | the feature's logic is already prepared for that. Change-Id: Ieb0131904b532409fc01bafca9f85fb22039a68a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Reimplement compiler default detectionLars Knoll2016-07-151-0/+10
| | | | | | | | | | | | | Change d1b09dba45c4b3ee0f31cd9bbf6941f17afd48f0 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>
* Remove -fw and -l command line argumentsLars Knoll2016-07-131-2/+0
| | | | | | | | | 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>
* fix command line option for avx512Oswald Buddenhagen2016-07-081-1/+1
| | | | | | | we need to map it to the avx512f feature. Change-Id: I565b5bd256003aa6f80180b0e06c04bad8ea68af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix compile-examples command line optionLars Knoll2016-07-081-1/+1
| | | | | | | Map it to the correct feature name. Change-Id: I7e2128e66a575ae7e562018b766d25f85c64c961 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Get rid of the qt_no_framework setting in the CONFIG variableLars Knoll2016-07-051-2/+1
| | | | | | | 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>
* Handle the -[no]make command line arguments in qmakeLars Knoll2016-07-021-2/+7
| | | | | Change-Id: I979f648b4301152e4a13ffe90aa05d9ded8556c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Determine the set of modules to skip in qmakeLars Knoll2016-07-021-1/+6
| | | | | Change-Id: I421f50e5944962eae41700180ee49a916a2a023d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix handling of -v/-verbose command line flags to configureLars Knoll2016-07-021-9/+0
| | | | | | | | 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>
* Call arch test through the new qmake based configure systemLars Knoll2016-07-021-9/+28
| | | | | | | | Detect host and target architecture from within qmake, and set QT_ARCH accordingly. Change-Id: I30255f88c7645d197bd07355a1dff02b377cbbe8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-07-011-0/+1
| | | | | | | | Conflicts: configure configure.json Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
* Harmonize directwrite handling between the configuresLars Knoll2016-07-011-1/+6
| | | | | | | | | | 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>
* Correct framework config options to remain as they used toAllan Sandfeld Jensen2016-06-271-2/+2
| | | | | | | | | Commit 90eee08b3e672573e3ad93470d844e1d498651dd 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>
* Correctly set simulator_and_device in ios buildsLars Knoll2016-06-241-1/+1
| | | | | | | | | 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>
* Let qmake do most of the work of configuring QtLars Knoll2016-06-221-0/+2493
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:02:29 +0000