summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* automate the installation of some more example source filesOswald Buddenhagen2016-05-031-0/+5
| | | | | Change-Id: I61f9f4882c5a7743817059824250958f5ce4a603 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* support directories in COPIESOswald Buddenhagen2016-05-021-4/+20
| | | | | | | | | | this makes it fully consistent with INSTALLS. note that this also removes the file name from the target path when copying files, also for consistency. Change-Id: I69042c9aa1e2cc81f8ff982343ba25688a04abfd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* add some missing filename expandos to extra compilersOswald Buddenhagen2016-05-021-1/+1
| | | | | | | | | | | - QMAKE_FILE_IN_EXT as an alias for QMAKE_FILE_EXT, for consistency with QMAKE_FILE_IN_BASE - QMAKE_FILE_IN_NAME to make pairing _EXT/_BASE to get a full name unnecessary (finally ...), and make use of it - QMAKE_FILE_OUT_PATH, because i'll need it Change-Id: I3d91ddb84f9cce52a665d562da11d165c92550c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove redundant OTHER_FILES assignmentsOswald Buddenhagen2016-05-021-3/+0
| | | | | | | | newer versions of qt creator understand QMAKE_EXTRA_COMPILERS and INSTALLS, so there is no need to list the files twice. Change-Id: Iccf3cc3248daf3422b8c366c2eb2d2f46c5f08d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* don't apply warning options to host buildsOswald Buddenhagen2016-04-291-0/+4
| | | | | | | | | | the host compiler's version is not determined, so we cannot make any assumptions about its capabilities. Task-number: QTBUG-53017 Change-Id: I939fd7402b5daac73f2195b9d8763b9008bc7ea4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* make use of COPIESOswald Buddenhagen2016-04-271-17/+2
| | | | | | Change-Id: I34965cada901fce3cf300a99fa65d4d3f9bd4578 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* add support for copying arbitrary filesOswald Buddenhagen2016-04-272-1/+42
| | | | | | | | | | | | | | | | | this adds file_copies.prf, which understands the variable COPIES, which works analogously to INSTALLS. i've been holding this off for a long time, as it is not without caveats. however, similar hacks are proliferating all over the code base, so it's time we formalized it. in fact, it's the easiest way to fix some nasty shadow build problems, which is why i'm adding this on the stable branch. Task-number: QTBUG-52256 Change-Id: Icbe3b9fbb79c952546aad2d467a438d3a69d749f Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix separate_debug_info with no_plugin_name_prefixJake Petroules2016-04-141-1/+1
| | | | | | Task-number: QTBUG-51782 Change-Id: I5499139c732f2ff474095e30bc1f7a22743f4b12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* qmake: Add support for separate debug info on Apple platforms.Jake Petroules2016-04-1411-16/+229
| | | | | | | | | | This makes the -separate-debug-info configure optional functional, which generates dSYM debug info bundles for Qt libraries on Apple platforms. Task-number: QTBUG-37952 Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: Ia247674740bf450130a15db926df07fa9007e2ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Clang 3.8 is clean of warningsThiago Macieira2016-04-131-2/+2
| | | | | Change-Id: Ibc83b9f7e3bc4962ae35ffff1425c8e686579e15 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* remove empty dylib.prfOswald Buddenhagen2016-04-121-1/+0
| | | | | | | it doesn't appear to be referenced in any way, either. Change-Id: Ifd30b435e3e628cd5e48ae24e9aef01c662d6d61 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix bugs in accuracy of target path calculation in resolve_target.Jake Petroules2016-04-111-2/+21
| | | | | | | | | | | | Incidentally, this introduces QMAKE_RESOLVED_BUNDLE, which can be used to determine the path of the bundle wrapper itself as well as the executable target. This is necessary for a subsequent patch adding support for -separate-debug-info on Apple platforms. Change-Id: Ia11430026b8e3f171e5db6677b190b8356832805 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Introduce RPI3 aarch32 mkspecDonald Carr2016-04-082-0/+75
| | | | | Change-Id: Ia76f7f5b1793a16ac17285d19429f70d722675cf Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Adjust egl config.test to pass sysrooted libsDonald Carr2016-04-081-1/+1
| | | | | | | | | | | We should really start using -L=/foo and -I=/foo inside of sysroots, this test was preventing us from doing so (while arguably buying us nothing). Change-Id: If6e67631c585493871231e5d8a9354fa72e07343 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* remove bogus no_cxx_module conditionalOswald Buddenhagen2016-04-081-1/+1
| | | | | | | | | | this flag specifies that the plugin does not track a qt module. this is entirely unrelated to whether the plugin should be versioned. amends f54a3d783. Change-Id: Ibd3e9bedf488dc58e6354ccf7dd33d974e5f52c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* winrt: Add capabilities as specified by modulesMaurice Kalinowski2016-04-074-2/+27
| | | | | | | | | | | | | | | | | | | | | | | So far no capabilities (but internetClient for Windows 10) were added by default, which forced developers to always manually edit the WINRT_MANIFEST.capabilities(_device) property. This allowed to leave out non-required capabilities and keep the created manifest clean, examples being microphone for multimedia. However, this also breaks first user experience as deeper knowledge about this topic is required. Furthermore this is inconsistent with other platforms like Android, where all capabilities are set by default and developers need to edit the manifest manually in any case. With this change, modules can define the capability set to enable all features in the module. If developers want to disable some again, they need to adapt the generated manifest. From our experience this needs to be done in any case, latest at publishing stage when the store manipulates the manifest. Task-number: QTBUG-38802 Change-Id: I6d522268ee0afbfa00a30dbdd5e6ec9f415bebf3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* winrt: Enable windeployqt by default for Visual Studio projectsMaurice Kalinowski2016-03-231-0/+2
| | | | | | | | | | | | | | | Using Visual Studio a user very seldom wants to disable the automatic invocation of windeployqt. Hence switch from opt-in behavior to opt-out. This also fixes first user experience to invoke qmake –tp vc and then hit run on examples. [ChangeLog][Platform Specific Changes][qmake] qmake-generated Visual Studio projects now automatically invoke windeployqt by default. Task-number: QTBUG-52008 Change-Id: Iee1607269c38c7f6c726f554978ac05477bebe5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* win32-icc: Make it possible to rename the ANGLE libraries.Friedemann Kleint2016-03-221-0/+4
| | | | | | | | | | | Adapt the mkspec which was forgotten in change b0ec05f27bff6065c97e6e4a0f1606da7472d18c. Task-number: QTBUG-48431 Task-number: QTBUG-51686 Change-Id: Ie95e650de8b7a7027979ec637fb77c7f0357a598 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-1/+1
|\ | | | | | | Change-Id: Iac8ff05cd76cbacf859138a73e8e2ed0a979c75a
| * fix non-git non-prefix shadow buildsOswald Buddenhagen2016-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | turns out we need forwarding .pris in this case: without them, QT_MODULE_INCLUDE_BASE points into the build dir, so we fail to find the pre-generated headers. an alternative would be writing primary module .pris which already take that into account, but that would just add even more arcane code paths. Task-number: QTBUG-51521 Change-Id: I59f2a0d3f2095c9dfa0a8d1cabfc007a30bd2d23 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | support relative paths in configure -ROswald Buddenhagen2016-03-163-15/+24
| | | | | | | | | | | | | | | | | | [ChangeLog][configure][Unix] configure -R now supports paths relative to -libdir. Change-Id: Ie56264a6dedcbaf5577c7ef44b056c8a7870ef48 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | make -D/-I/-L/-l/-R not affect bootstrapped toolsOswald Buddenhagen2016-03-161-0/+4
| | | | | | | | | | | | | | | | | | it's likely that these will be wrong, and the bootstrapped tools usually don't need them anyway. should they turn out necessary after all, we need to add -H* variants of the flags. Change-Id: I15c54c5e25d20ebd474073a530f00254842f515d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | delay application of configure -D/-I/-L/-l/-R flagsOswald Buddenhagen2016-03-162-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | it is important that the flags coming from the current qt build appear first, as otherwise a pre-existing qt installation may interfere with the build. the windows configure does not have any of this magic to start with. Task-number: QTBUG-6351 Change-Id: Iacc1d9b5aa9eed9a5f0513baef9f6c6ffcef0735 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | build with explicitlib after allOswald Buddenhagen2016-03-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlike speculated in 2fe363514, this is not a workaround at all: it causes that libraries' public link interfaces (LIBS) are exported in the first place. unlike with staticlib, this does not export LIBS_PRIVATE, so it wouldn't even be a particularly effective workaround for rpath brokenness anyway. the problem was pretty well hidden by the qt module system, which at the level of libraries is pretty redundant with the .prl file handling, which shows just how stupid the whole "design" is. unlike before, we now enable explicitlib for all libraries, not just qt modules - we enable create_prl for all of them as well, after all. an immediate effect of this change is that it fixes linking on RaspPI: the qtcore headers make the user code require linking libatomic, so we must add it to our public link interface. Task-number: QTBUG-51621 Change-Id: I5742c88694db8e8a9b79d17222dc6df2b38e5ab2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Disable c++ standard compiler flags for the host buildPeter Seiderer2016-03-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no test for c++ standard support for the host build (only for the target compiler/build) which leads to trouble in some cross compiling environments (old host compiler, new cross compiler): g++: error: unrecognized command line option ‘-std=c++1z’ So disable c++ standard compiler flags unconditionally for host builds. Task-number: QTBUG-51644 Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | export private module's deps as run deps of the public moduleOswald Buddenhagen2016-03-071-2/+5
| | | | | | | | | | | | | | | | | | | | this is necessary for: - generating -rpath-link arguments when link_prl is not used. link_prl is enabled by default, so this has no effect on most projects. - deployment purposes, which is hypothetical as of now. Change-Id: I9e629f3eef93c4edf12efc016ecc27dbe2186d61 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qt_common.prf: when looking for GCC >= 4.6, match GCC 6+, tooMarc Mutz2016-03-051-2/+2
| | | | | | | | | | Change-Id: Ia04690f62faa214fb91dffc758e253b5a64e5648 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Don't include <windows.h> in the Windows CE qplatformdefs.hJoerg Bornemann2016-03-031-1/+0
| | | | | | | | | | | | | | | | This header defines "interface" which will break compilation of dbus. Change-Id: I16fa35f822adca14304aa827b047358409d4a150 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | mkspecs: Add a benchmark "feature".Robin Burchell2016-03-023-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | Testcases and benchmarks are rather different entities. You won't usually want to run benchmarks in the same environment you are wanting to run tests in, so this feature allows to differentiate between the two. We also add a "benchmark" make target (similar to check), which runs all configured benchmarks. Change-Id: I33759ce44c34e42a6a3a88f34e7b9c4372380721 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update QMAKE_LIB in win32-g++ mkspecBoris Pek2016-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ar' tool from latest binutils shows warning: ar error: `u' modifier ignored since `D' is the default (see `U') Warning message includes word "error" so QtCreator processes it as error in UI. `ar' command-line option `u' might be dropped safely because it is unnecessary. Option `c' is added to suppress extra `ar' warnings. Other build systems are also affected. For example, automake: https://bugzilla.redhat.com/1155273 Change-Id: Ia378b720503d93b0c0c12ae7a5f38f4d7c32eee5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Set QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO for win32-g++Hannah von Reth2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | The win32-g++ mkspec is not based on gcc-base, so QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO is not inherited. Therefore, -release -force-debug-info would build with neither -O2 nor -g. Change-Id: I4e97cb08f577062dd342fb3e91c02adfd636a310 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | unhack qt_install_headers vs. lib_bundleOswald Buddenhagen2016-02-192-2/+2
| | | | | | | | | | | | | | instead of unsetting the flag later on, don't set it in the first place. Change-Id: Id448500b02b5c3e1dc7c332cc178a84c7fd2cfdc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | load qt_common in qt_helper_libOswald Buddenhagen2016-02-191-0/+3
|/ | | | | | | | | | | | | | this has multiple consequences: - we do sane DESTDIR replacement for debug_and_release builds, fixing QTBUG-47313 - we don't create debug/release subdirectories, fixing QTBUG-47639. this only makes sense given the complementary call of $$qt5LibraryTarget() - we patch up the .prl files upon installation Task-number: QTBUG-47313 Task-number: QTBUG-47639 Change-Id: Id409bbd26781a773409b94835ab6b97e71569322 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Swap the GCC and Clang versions of supported FreeBSD mkspecsThiago Macieira2016-02-026-10/+10
| | | | | | | | | | | | | | | | | | | | Modern FreeBSD doesn't come with GCC by default anymore and doesn't even provide the "gcc" or "g++" falback that OS X does. So there's no point in keeping the freebsd-clang mkspec in unsupported/ since it's the only one that works, or keeping the freebsd-g++* ones outside, as they won't compile. I'm not removing the GCC mkspecs because you can still install GCC from the ports tree. [ChangeLog][FreeBSD] The "freebsd-clang" mkspec is no longer in the unsupported/ subdir. If you have scripts you use to build Qt, you'll need to update them to say -platform freebsd-clang or remove the -platform argument. Change-Id: I7a9e11d7b64a4cc78e24ffff142dfc11d3aabb1e Reviewed-by: Raphael Kubo da Costa <rakuco@FreeBSD.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Use extra compilers for the linker version scriptSamuli Piippo2016-02-021-8/+12
| | | | | | | This ensures correct separator handling and quoting. Change-Id: I0f9cc7024cac579ea4c81f0c28754b1424ae2bd4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-023-2/+269
|\ | | | | | | Change-Id: I95962e28b6fc101cbbad41230585e2b61f1f6c0f
| * Add tool to namespace Objective-C classes at link timeTor Arne Vestbø2016-01-292-0/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature is enabled by CONFIG += unsupported/objc_namespace, but can be easily integrated into other build systems such as CMake or native Xcode by modifying the LD and LDFLAGS equivalent for each build system. This is a less resource-intensive alternative to using multiple Qt builds with different -qtnamespace settings. Note: The feature is not supported in any way, and should be used with care. Change-Id: Ibb8ba1159db36efd7106c117cc2210c7e2e24784 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * winrt: update version settings in default manifestMaurice Kalinowski2016-01-261-1/+1
| | | | | | | | | | | | | | | | 10240 describes the first official non-preview Windows 10 SDK. 10586 was the SDK for the first November update. Change-Id: Ieb61b944295946eab594b3c7bf234155a67b752e Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * winrt: Add mobile schema to default manifestMaurice Kalinowski2016-01-261-1/+2
| | | | | | | | | | | | | | | | This allows users to add mobile specific features. Also it implicitly enables support for continuum on Windows 10 Mobile. Change-Id: I965123722f46df6e84fd279c3bfce478c1172632 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | support specifying directories in RESOURCESOswald Buddenhagen2016-02-011-3/+9
|/ | | | | | | Change-Id: Ie97b26dd8ccf33d7f2a72bc6a5aec478b196ebb6 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com> (cherry picked from commit 4b224816aa2902e10835a560d14e305cfdc32bac)
* give the pkg-config wrapper a proper nameOswald Buddenhagen2016-01-211-0/+1
| | | | | | | amends 282f15feaa. Change-Id: I91fa244a9c33495365da4278b99d6312c1af299a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Make pkgConfigExecutable() work when a pkg-config is defined in the specChristian Strømme2016-01-212-2/+5
| | | | | | | | | | | | Commit 6e6f27b6 made it possible to set the PKG_CONFIG variable using CROSS_COMPILE as a prefix. The problem with that solution is that it makes pkgConfigExecutable() skip the environment setup for pkg-config as well, as it expects the pre-set command to be self-contained - which it isn't. To avoid this problem we need to store the pkg-config define in the device spec in a separate variable. Change-Id: Id8ae7fb03d9253be55840e23fe73b30815ee86c3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-192-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/common/atomic64/atomic64.cpp configure src/3rdparty/forkfd/forkfd.c src/corelib/io/forkfd_qt.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tools/configure/configureapp.cpp Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414
| * qt_functions.prf: Add missing $$evalDmitry Shachnev2016-01-051-1/+1
| | | | | | | | | | Change-Id: I3d60617bdc887447f433c47ac6af3c1e13756c28 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Make -no-rpath build more useful on Apple platformsMartin Afanasjew2015-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform Specific Changes][OS X] Configure with -no-rpath will now yield Qt dynamic libraries and frameworks with an absolute install name (based in -libdir). OS X package managers like Homebrew install Qt in a fixed location. This change simplifies deployment for such package managers and is consistent with the default expectation on Apple platforms for libraries with a fixed location to also have absolute install names. While a relocatable installation (the default) also works in this scenario, it requires all software that depends on Qt to be aware of this and to embed a suitable RPATH into application binaries (which is not automatic for non-qmake builds). This might not be true for some select fallback search locations, but as package managers on OS X tend not to use those, embedding an RPATH becomes practically mandatory. In a default Homebrew installation, Qt is configured such that the frameworks end up in /usr/local/Cellar/qt5/<version>/lib and that will be later symlinked to /usr/local/opt/qt5/lib, both of which are not searched by the dynamic linker by default. Task-number: QTBUG-48958 Change-Id: I4395df98771e06a2ce8a293d11dc755bdc50757f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | CMake: Don't attempt gui-tests if Qt is built with -no-guiStephen Kelly2016-01-181-0/+1
| | | | | | | | | | Change-Id: I5f327fa1b0c7827535a4b00ca7d0d4281b1eec7b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | unbreak propagation of dependencies on private modulesOswald Buddenhagen2016-01-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most module project files define two logical modules: a public one and the corresponding private one. these are really separate modules as far as qmake is concerned (even though the private one contains just headers), and consequently have separate dependencies - QT and QT_FOR_PRIVATE. as public modules cannot depend on private ones, all private dependencies would have to go to QT_FOR_PRIVATE, and a dependency on the respective public module would have to be added to QT. this would be a bit tedious, so we have a convenience feature which allows putting private dependencies into QT, but automatically "downgrades" them to their public counterpart when creating the public module's .pri file. however, we failed to put verbatim versions of these private dependencies into the private modules, which meant that these dependencies were not pulled in transitively by the private modules' users. note that this entirely unrelated to QT_PRIVATE - this one defines the private (non-propagated) dependencies of the module's implementation, i.e., the libraries (and headers) that are not part of the link interface. there is no QT_PRIVATE_FOR_PRIVATE, because there is obviously no point in assigning the dependencies to a particular logical submodule when neither one inherits them as far as the qt module system is concerned. Change-Id: Ib056b47dde3341ef9a52ffff13efaf8ef8e6817b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | make module .pri files more flexibleOswald Buddenhagen2016-01-132-46/+62
| | | | | | | | | | | | | | | | | | | | | | | | save the actual library/framework name and framework paths in the .pri file instead of computing them again at use time in qt.prf. qt_no_framework_direct_includes inherently requires a use-time decision, so this ugliness remains. Change-Id: I09b2775e7d8e1d52e3af0d663e1babde10ae4814 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Append the environment's QT_PLUGIN_PATH to 'make check' targetsRomain Pokrzywka2016-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, any test executable requiring a plugin path from the environment's QT_PLUGIN_PATH will fail to run since the path is overwritten when generating the 'make check' command, for example: QT_PLUGIN_PATH=/path/to/qt/plugins \ LD_LIBRARY_PATH=/path/to/qt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \ ./test_foo A prepend config option is used for *PATH to preserve the envvar value, so use the same option for QT_PLUGIN_PATH. The command above then becomes: QT_PLUGIN_PATH=/path/to/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} \ LD_LIBRARY_PATH=/path/to/qt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \ ./test_foo Change-Id: I69b43327974915eae52f299fc4001effe93a491a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | disable install targets for non-prefix buildsOswald Buddenhagen2016-01-122-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | one reason to do that is some users' persistence in destroying their non-prefix builds by trying an installation. another reason is the fact that qt.pro's relative_qt_rpath is triggered by the presence of an install rule for the target, which is of course not helpful when the install dir is bogus. Task-number: QTBUG-48406 Change-Id: I75f3940be79fcb5b86e34b975b789692423c92cb Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 11:56:05 +0000