summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_installs.prf
Commit message (Collapse)AuthorAgeFilesLines
* don't include injected headers into linker version scriptOswald Buddenhagen2016-10-141-1/+1
| | | | | | | | | | | it makes no sense to version them, as they contain only #defines anyway. it also removes the need to special-case their location in shadow builds with pre-synced headers, which we actually failed to do anyway. Task-number: QTBUG-56286 Change-Id: I4ea717f7be56494cfea0572389bea173d7470b6e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* install .lib files for static libs againOswald Buddenhagen2014-06-161-1/+1
| | | | | | | | | the no_dll switch has questionable semantics: it pro-actively breaks non-dll builds. therefore its usage needs to be limited to dll build. Task-number: QTBUG-39594 Change-Id: I98328e502693df835af565b5ec25ada2c1c168ad Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* actually don't install qt dlls into lib/ any moreOswald Buddenhagen2014-06-051-0/+1
| | | | | | | | | it helps enormously to use the flag correctly. amends f0c34eb08f. Change-Id: I04a63cc59e133169d9f6677f2f88ef98fd5c524c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* rewrite handling of private modulesOswald Buddenhagen2013-10-241-1/+6
| | | | | | | | | | | | | | | | instead of being magic attributes of the main modules, the privates are now proper modules of their own. this cleans up some code paths, is more mappable to other build tools, and enables private modules to depend on other private modules. note that the library path is needed even in the "empty" private modules, as in the framework case that's where headers are found. consequently, the modules need to be explicitly marked with the new "no_link" flag. this required some reorganization of qtAddModule(). Change-Id: I8e4f44a609f8d639cc01bcb658256870a627eb63 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* install host libraries into -hostprefixOswald Buddenhagen2013-05-131-2/+8
| | | | | | | | | | | | | | ... and introduce -hostlibdir configure option for symmetry. the libraries built for the host have no business in the target prefix. in principle this code would even support dynamically linked host libraries, but that's currently unused. Task-number: QTBUG-30591 Change-Id: I8e600fa4911a020fb0e87fbf7ef2f35647c7c4d5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Ivan Romanov <drizt@land.ru>
* mark a bunch of features as internalOswald Buddenhagen2012-12-121-0/+11
| | | | | Change-Id: I5ad28827ff317985414e859263af85ceec31207c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* centralize doc target related codeOswald Buddenhagen2012-12-021-19/+0
| | | | | | | 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>
* 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-301-4/+4
| | | | | | | 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>
* revamp doc generation targetsOswald Buddenhagen2012-11-271-9/+16
| | | | | | | | | | | | | | - 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>
* Prevent 'make install' from automatically installing documentationTor Arne Vestbø2012-10-181-1/+5
| | | | | | | | | Just like 'make docs' is used to build documentation, you will now have to run 'make install_docs' to install it. Change-Id: I57db53160ca91618784f4e39da0a47322c070208 Task-number: QTBUG-27590 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Modularize documenation buildTor Arne Vestbø2012-10-101-0/+8
| | | | | | | | | | qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global includes, instead of using relative paths. Qt modules will automatically get a doc target that builds and installs into the right place (including supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module). Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* remove workarounds for broken syncqtOswald Buddenhagen2012-06-191-4/+0
| | | | | | | SYNCQT.HEADER_FILES contains qconfig.h just fine nowadays. Change-Id: I52b35d2ac41d772acaef06f3931df75742c867cb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add possibility to install a module with no libraryOswald Buddenhagen2012-06-191-6/+8
| | | | | | | the declarative module is a fake, so there is no library to install. Change-Id: I0dcd39f3304e38adce9ea34e2268905525abd3d5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make qt_module_config.prf install the module pri fileOswald Buddenhagen2012-06-191-0/+10
| | | | | | | | | absorb module.prf into qt_installs.prf, as that's where it belongs. add qt_install_module option and automatically set it in qt_module_config. make qt_installs use that option. Change-Id: I860616f3a29a456f7b88ddaffa09375400c8911e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix qpa files installationGirish Ramakrishnan2012-05-081-0/+4
| | | | | | | qpa header files were not installed under qpa/. Change-Id: I243c3a7e83a342f7485791a1a29b65c9a8f25d6b Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Install fonts when not using fontconfigGirish Ramakrishnan2012-03-161-6/+0
| | | | | | | | | | | When built without fontconfig support, the basic unix font database relies on fonts installed in libs/fonts to populate the database. Change-Id: Id1e54c5b032095470049210bb831cfe4c79b3569 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove usages of QT_ARCH and QT_ARCH_* from qtbaseBradley T. Hughes2012-02-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The architecture is detected at compile time based on the predefined macros from the compiler. Don't use QT_ARCH in .pro, .pri, or .prf files. The PNG_NO_ASSEMBLER_CODE define from libpng.pri is not present in the current copy of src/3rdparty/libpng, so no change in functionality is expected. The conditional for the SUPPORT_JIT define in pcre.pri is moved to src/3rdparty/pcre/config.h, again so that we can use the compiler's predefined macros to detect the architecture at compile time. Replace QT_ARCH_ARM, QT_ARCH_MIPS, and QT_ARCH_SPARC with their Q_PROCESSOR_* equivalents. Replace QT_ARCH_INTEGRITY, QT_ARCH_VXWORKS, and QT_ARCH_WINDOWSCE with their Q_OS_* equivalents. Note that this commit also effectively disables the SPARC atomic implementation. An inline implementation for SPARC needs to be added, or we remove the current code and instead rely on the GCC intrinsic or C++11 std::atomic support on SPARC. Note also that this commit does not remove QT_ARCH from configure or qconfig.h. This will continue to be set until all Qt 5 projects can be moved away from using QT_ARCH. Change-Id: I5de747cc4436d21941329974cff3016970f497b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* mkspecs: Remove qpa conditionals.Friedemann Kleint2011-10-311-1/+1
| | | | | | | Preparing removal of -qpa from configure. Change-Id: Id2f784206f97729c739cf20504a2a9428ddc1cce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Moved common module profiles to be feature profiles.axis2011-06-051-0/+44
This enables external modules to also make use of them without having access to the complete QtBase source code. Change-Id: I056e45cba6c6798b76670b8d238dadb2d9f9c092 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/234 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>