summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* replace all modules' build dirs while installing .pc, .la & .prl filesOswald Buddenhagen2012-12-061-2/+6
| | | | | | | | | now we may get files with several mentions of the same lib/include dirs on the same line, but that's essentially a non-issue. Task-number: QTBUG-28336 Change-Id: I8204086420b82015f62090ae0a56908ce0cccee8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* export the Qt top-level include dir as pkg-config ${includedir}Oswald Buddenhagen2012-12-061-2/+2
| | | | | | | | this seems more generic, and allows for more substitutions inside the generated files. Change-Id: I7a2e37036f9f9f7dbf7f28f0976ef427dd28ee82 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* export only 'host_bins' to pkg-config, rather than a random selection of toolsOswald Buddenhagen2012-12-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | the "export location" of the linguist tools was just bogus, and lconvert was missing anyway. the two dbus tools and qdoc were missing, too. generally, it seems useless to report the paths of some random tools - instead, just report the install location of the host binaries and let users figure out the complete paths themselves - this should be ok, as we decided that distributors are not supposed to do tool renaming any more. for the binary path just use the final location, as the files won't be used before installation anyway. this allows us removing the scary generic prefix replace from the pc file installs. and as a side effect this also fixes debug_and_release builds of core and widgets by not loading various prf files prematurely and thereby messing up the dir replacement magic. Task-number: QTBUG-28286 Change-Id: I99de419301fc07fb923959db4bd5cab9072d1c31 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove unused assignmentOswald Buddenhagen2012-12-061-1/+0
| | | | | Change-Id: Id60af477b9608bd3dfd0659d9d3a6e202fbe7dc9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't make the doc installs depend on the regular buildOswald Buddenhagen2012-12-051-2/+2
| | | | | | | it's pretty pointless Change-Id: Icea0073683a2d949798147fba3fad5b3331b1125 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix doc target recursionsOswald Buddenhagen2012-12-052-32/+32
| | | | | | | | | | | | | | | | | in particular for the meta Makefiles of debug_and_release. the logic is as follows: - the meta targets ('html_docs' in prepare_docs mode, and 'docs' always) need to branch out asap, so they are implemented non-recursively in every makefile. - all other targets need to be fully recursive. the meta Makefile will recurse only into one of debug or release, depending on the configure option (it doesn't matter anyway). Change-Id: I4e3f714cdda9c3a1021743148b5ee73379e3484d Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make the addition of docs/-install targets unconditionalOswald Buddenhagen2012-12-051-4/+0
| | | | | | | | there is no reason why something should break out of the system. Change-Id: I081bffc0927b43ac4940d0200e32e1e60f6f2e97 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge branch 'master' into stableOswald Buddenhagen2012-12-036-20/+16
|\ | | | | | | Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
| * don't forget to export rpath_link{,_private} to the cacheOswald Buddenhagen2012-12-031-0/+1
| | | | | | | | | | | | Change-Id: I1d204696ed0e4ef5e45dc1716b3d6a8224b3169b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * remove support for hand-written module pri filesOswald Buddenhagen2012-12-031-10/+0
| | | | | | | | | | | | | | | | all modules have been migrated to auto-generation Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * don't auto-install example sources by default for all modulesOswald Buddenhagen2012-12-031-1/+0
| | | | | | | | | | | | | | | | | | turns out that some modules need a lot of work, so make it opt-in for the time being. Change-Id: I16365e3d96adab98a1bc748907dbd67488dfad5f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * auto-collect qml-related sourcesOswald Buddenhagen2012-12-031-0/+5
| | | | | | | | | | | | | | Change-Id: Ia5b56227c2c1f18254d35f6105ac3a146f085e3b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * factor out testcase_targets.prfOswald Buddenhagen2012-12-033-9/+10
| | | | | | | | | | | | | | | | | | instead of letting *every* qmake-based project have recursive check target, let interested projects "subscribe" to it by adding CONFIG+=testcase_targets in a central place (.qmake.conf, which Qt itself does via qt_build_config.prf). Change-Id: Ib13fdd2d3a1adee0c5ad02b6b176a664c583bf9d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | introduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)Oswald Buddenhagen2012-12-032-3/+5
| | | | | | | | | | | | | | | | | | complementary to QMAKE_RPATHDIR. this avoids that we need to sprinkle linux/gcc specific code all over the place. Task-number: QTBUG-27427 Change-Id: Iebafd1749d1a0d803704902473df8c743f074ddc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Stop using the name "Trolltech" in QSettingsSergio Ahumada2012-12-032-2/+2
|/ | | | | | | | | Also change Trolltech for QtProject in other places Task-number: QTBUG-23269 Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize doc target related codeOswald Buddenhagen2012-12-025-53/+48
| | | | | | | Change-Id: I710a7f2fc3422ec8ba5b8e90bfd92e7931092ad0 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* resolve private dependencies of tools as wellOswald Buddenhagen2012-12-021-1/+2
| | | | | | Change-Id: I25c73661489f0a6e6ecf3bb423cdae6435221e25 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* ANGLE: Fix debug-and-release buildsFriedemann Kleint2012-12-016-1/+11
| | | | | | | | | | | | | | | Add a 'd' to debug builds to allow both release and debug builds to be used. - Add .def-files for Debug - Build all libraries debug/release - Add description to README.qt - Differentiate debug/release in qmake.conf. Task-number: QTBUG-28196 Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* don't link qtmain.lib when using idcidl.prfJoerg Bornemann2012-11-301-0/+3
| | | | | | | | QAxServer projects must not link qtmain.lib. This awful hack was adapted from the old qaxserver.prf Change-Id: I78b4cbf6714bfbd88341449b9230f1989cff8a6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Added custom flags for enabling dependencies of other parts to toolsMiikka Heikkinen2012-11-301-0/+3
| | | | | | | Introduced CONFIG flags examples_need_tools and tests_need_tools. Change-Id: I4789d05f6bc0a63c75340c3b3e2aecde18c42c20 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* expose a little less of the build host's file system structureOswald Buddenhagen2012-11-301-2/+5
| | | | | Change-Id: I6fc675b9aeae0744c3308cd20ffd8c115c271c58 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* remove another pointless indirectionOswald Buddenhagen2012-11-301-2/+2
| | | | | | | | we directly expand $$TARGET on the same line, so just do the same with $$VERSION Change-Id: I3601bfcc835b13f63dce43d00cfe8d34ded60b21 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* remove unnecessary indirectionOswald Buddenhagen2012-11-301-2/+2
| | | | | | | we are assigning QT.*.VERSION from VERSION a moment earlier Change-Id: Ie4d51f8835b8050755bc399a1a597967c8e3e499 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* make it possible to name include dir differently from library nameOswald Buddenhagen2012-11-304-18/+20
| | | | | | | ActiveQt needs that Change-Id: Ib9f69d19e8042c1ab0f211eebb9237bc2fb77aa3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* don't install headers into Qt/ any moreOswald Buddenhagen2012-11-301-12/+2
| | | | | | | this should have been part of 656e0d342. Change-Id: I56e5d743a756e9236759595429de85754593638e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Add a way to not generate INCLUDE_DIRS variables.Stephen Kelly2012-11-301-0/+5
| | | | | | | | | | ActiveQt needs this, and it sets the no_module_headers flag. We still need to set the include_dirs variable in the no_module_headers case, so that its dependencies are added to it. Change-Id: I2cad5ee792eed51d36b7c8e2c616763516a5fc10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-11-292-0/+72
| | | | | | | | | | | | | it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk <qthjk@ovi.com>
* factor out qt_docs_targets.prfOswald Buddenhagen2012-11-283-54/+53
| | | | | | | | | instead of letting *every* qmake-based project have recursive docs targets, let qt modules "subscribe" to it explicitly by having load(qt_build_config) in their .qmake.conf (which they already do). Change-Id: I97b74591fd0c4bd5f8b08c5f550df9c7eef2f556 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* reformat assignment to ease later modificationOswald Buddenhagen2012-11-281-5/+7
| | | | | Change-Id: Ib8741baf678583fe56ea0f0a5d4cf2ee22b21b3a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add a -libexecdir option to the configuresThiago Macieira2012-11-283-1/+5
| | | | | | | | | | | | | | | | | | User applications are those that users run directly, whether it be for development or not. The executable binaries that the user does not usually run but is still required for proper functioning are called "program executables" in Autoconf and they are placed in libexec. This commit adds support for "program executables" in Qt by adding the -libexecdir option to the configures, the qmake variable QT_INSTALL_LIBEXECS (note the plural, to match all other properties), and QLibraryInfo::LibraryExecutables. At the time of this commit, the only expected "program executable" is the QtWebProcess, the WebKit2 helper process from QtWebKit. Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* revamp doc generation targetsOswald Buddenhagen2012-11-273-17/+39
| | | | | | | | | | | | | | - the old docs target becomes html_docs - a new qch_docs target is added. the .qch files end up directly in QT_INSTALL_DOCS, wihout any subdirectories in between - the new docs target invokes html_docs and qch_docs - respective un-/install targets are added as well. note that the install targets don't depend on the build targets, as it's virtually impossible to get the dependencies right throughout the hierarchy. Change-Id: I07a2589db8252371e77cf925c47c4e59fbd1b2ca Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* adjust to modularization changes in ActiveQtJoerg Bornemann2012-11-273-27/+8
| | | | | | Task-number: QTBUG-27776 Change-Id: I1c30270867d20f028bad09fdc5408a414b122f5b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake: Change copyright information from Nokia to DigiaSergio Ahumada2012-11-261-2/+2
| | | | | | | Task-number: QTBUG-28156 Change-Id: If54615a465504b4124891fb393185eb324372874 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* BlackBerry mkspecs: optimize linker flagsPeter Hartmann2012-11-262-0/+4
| | | | | | | | | | | | | | * relro makes some sections read-only before giving control to the program; * now resolves all symbols when the program is started and allows for the GOT being marked read-only to prevent it from being overwritten. These settings have been used internally for device builds already. Change-Id: I9f62fffe618c75748e2357d1686289c23c5dbee5 Reviewed-by: Greg Bentz <gbentz@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* BlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)Peter Hartmann2012-11-231-0/+2
| | | | | | | | | ... so the compiler knows which instructions to generate and can optimize for the specific CPU. All BlackBerry platforms are Cortex-A9 compatible. Change-Id: I3fd22e63af12f704365f494bbb7138963b4c4ec7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Mac: Fix compilation with -sdk optionEike Ziller2012-11-231-2/+5
| | | | | | | | | | | | The include paths that the mkspecs set into the OpenGL/AGL frameworks must take the SDK into account. (The headers in 10.8 have slightly changed wrt 10.7, leading to compile errors because framework style includes (<OpenGL/foo.h>) within the system headers are resolved to the SDK framework headers.) Change-Id: I6113cdb95b462d587f593682e03e81e920f3f672 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* bootstrapped tools don't need env var setupOswald Buddenhagen2012-11-221-1/+1
| | | | | | Change-Id: I15d818d3ca24d426e492ea9d3a423f661b3ccf3b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* packagesExist(): always return false if QT_CONFIG contains no-pkg-configMilian Wolff2012-11-211-1/+2
| | | | | | | | | | | | | On QNX e.g. you'll end up with a Qt configured without pkg-config support by default. Once you try to compile e.g. QtWebKit which contains a check like packagesExist(libudev) the system pkg-config (see default branch of pkgConfigExecutable) will be called without any special config sysroot or libdir. Thus libudev will be found in your system host, even though it is not available for the cross compile target. This leads to compile errors as described in https://bugs.webkit.org/show_bug.cgi?id=98032 . Change-Id: If1474cb3b3f3b71fad7269e4aedd4e10f70a9b2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't set CONFIG+=release during build passesOswald Buddenhagen2012-11-201-1/+1
| | | | | | | | | | otherwise we get inconsistent builds. Task-number: QTBUG-28046 Change-Id: I7952000bfc8e02ced5fd2c1bbffab7384f2730c1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-202-3/+18
|\ | | | | | | | | | | | | | | | | | | | | Added prepare_docs to qt_build_config.prf (it was added directly in configure in the source branch) Conflicts: configure tools/configure/configureapp.cpp Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocsJerome Pasion2012-11-0215-160/+137
| |\ | | | | | | | | | Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
| * \ Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-2624-4/+42
| |\ \ | | | | | | | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| * | | Add config option to build documentation as a two-step processTor Arne Vestbø2012-10-251-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new 'prepare_docs' CONFIG option triggers the documentation rules in default_post to generate two extra targets: prepare_docs and generate_docs. The prepare_docs stage runs qdoc with the -prepare option, which means qdoc will only generate index files, and the generate_docs stage will call qdoc with -generate, which reads the index files and generates the final output. The regular docs target will then run the prepare_docs target for all submodules before running the generate_docs target. This ensures that when generating the final output, qdoc has all the index files for all the other modules available, to be able to resolve cross-references between the various Qt modules. This patch needs a follow-up in qt5.git to add CONFIG+=prepare_docs, so that the root Qt5 build will be able to hook into this new behavior. Change-Id: I654d7f0d4d5a41d9be208e6d3a8923bf0194f9ad Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | Add a new location for QML 2.x importsThiago Macieira2012-11-195-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds a -qmldir configuration option for the configures to allow the user to change the default location (it defaults to $archdatadir/qml). It adds a QLibraryInfo::Qml2ImportsPath value for QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf configure location entry "Qml2Imports". At the same time, it makes the qmake .prf files dealing with QML plugins be the QML 2 version. Those files are new in Qt 5, so we have the option to choose which version we want to use. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Remove obsolete Mac mkspecs.Morten Johan Sorvig2012-11-185-295/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project Builder was replaced with Xcode in Mac OS 10.3. The xlc compiler is not in use on OS X any more. Change-Id: Ie9150243cf5594a70f692a6841ee8221a2fa9ddb Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | | make qt_tool support building bootstrapped toolsOswald Buddenhagen2012-11-161-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a "side effect", this fixes the build of bootstrapped tools when doing a debug build under msvc: qt.prf would add CONFIG+=release after default_post.prf already loaded debug.prf. Change-Id: Idd17cf28d358950fd90bb18ca7a8d67e06953bc1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | qtAddModule(): define PRE_TARGETDEPS for static modulesJ-P Nurmi2012-11-141-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that for example the platform plugins get properly re-linked when the static platform-support lib changes. Change-Id: Iad493d4de30d6f6977f80aa56d0b27d05e9e3770 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Don't link QtGui to winspool.dllKonstantin Ritt2012-11-137-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The printer support API has moved to printsupport module/plugins Change-Id: I6fdc6c08e600d0f7cc8d79bef808227b54880904 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | Refactor create_cmake to re-use the computed stem.Stephen Kelly2012-11-131-27/+29
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b277316b1befbb57613b465fc5bbedc6b2305f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | define the module rpath in the installed module pri fileOswald Buddenhagen2012-11-133-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the fallback path wouldn't account for a sysroot. as there is no clean way to implement that, rather remove the fallback alltogether and make the rpath a mandatory part of modules. Change-Id: I6f2bd6e36889be2f61e17a579174380aa3c6622d Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 14:48:14 +0000