summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Rename the syncqt -qtdir to -mkspecsdirThiago Macieira2012-10-191-1/+1
| | | | | | | | | It's actually looking for the mkspecs (so it can read qconfig.pri to get the Qt version), so give it exactly what it wants. Change-Id: I2957b2d93a8837b8492d313209d45ff3ec01704c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Prevent 'make install' from automatically installing documentationTor Arne Vestbø2012-10-182-1/+13
| | | | | | | | | 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>
* Refactor recursive target logic out of default_post into functionTor Arne Vestbø2012-10-182-31/+31
| | | | | | | | | The qmake function prepareRecursiveTarget can now be used both by the existing logic in default_post, as well as future recursive targets that will be needed as part of the modularization of documentation builds. Change-Id: Ibc72c3e224cb57c9f1796de3b04fda9de663dbb4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* add a .qmake.conf file which load()s qt_build_configOswald Buddenhagen2012-10-182-2/+9
| | | | | | | | | | | | | | that way we don't have to auto-generate code for that in the configures. note that we now load qt_build_config.prf instead of just qmodule.pri, which means that exceptions_off is set everywhere. we forcibly re-enable them for testcases to minimize the deviation from default 3rd party usage. testlib selftests are not qt testcases, so the one that needs exceptions needs to enable them explicitly. Change-Id: I1b9360bb11f2e80c92a2b63a7c45991ad17fda1b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* There's no uic3 anymoreThiago Macieira2012-10-171-76/+0
| | | | | Change-Id: Iacbe2e6a802278c2c82ae60551eae5bc2636e6f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix syntax of warning messageOswald Buddenhagen2012-10-161-1/+1
| | | | | Change-Id: I2e0a9afd6e46534156b7277dc5ceaf85d2dd4cac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QML plugins: Make sure that both debug and release versions are builtKai Koehne2012-10-161-1/+9
| | | | | | | | Make sure that both debug and release versions of QML plugins are built if Qt is configured accordingly. Also pass on the other QT_CONFIG configurations. Change-Id: I4aaaf002068dd66277235bef7d1e3da3366d6d12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use the mkspec name Qt was configured with instead of default symlinkStephen Kelly2012-10-161-0/+2
| | | | | | | | | The default symlink is not available on Windows, so the qplatformdefs.h header is not available there. Instead we can bypass the symlink and use the actual mkspec name directly. Change-Id: I1d7e05f35c1ff56befab5bed307cb1755ade8377 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Get rid of QT_MODULE_DOC_BASE/QT.foo.docsTor Arne Vestbø2012-10-162-4/+14
| | | | | | | | | It was only needed by qt_module.pri anyways, to handle index lookup paths for qdoc when building documentation that depends on other modules. Change-Id: Ibf60e2504f388b1aed7231eee04d89d3ba31c6eb Hand-held-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Modularize documenation buildTor Arne Vestbø2012-10-103-0/+14
| | | | | | | | | | 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>
* Ensure that Qt.module.docs is set when first creating the module-fwd fileTor Arne Vestbø2012-10-101-1/+1
| | | | | | | This is a follow-up fix to aef441b1. Change-Id: Ie5e92ecc55ddcbab3e7830a99a77d3748a5568c1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add QT.module.docs variable to the module systemTor Arne Vestbø2012-10-082-0/+2
| | | | | Change-Id: Ibe54ee44a06747453bc09e006e27187cbee30b23 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Rename quick1_debug back to declarative_debugKai Koehne2012-10-041-0/+0
| | | | | | | | The library name changed back from quick1 to declarative, so the debug option should be renamed accordingly. Change-Id: I192520a0a4de4764cf93da8cdbb14e24ba7de093 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: change suffix for separate debug filesPeter Hartmann2012-10-011-7/+9
| | | | | | | | QNX uses .sym for files containing debug symbols. Change-Id: Ieb995ae90af771ff5c877213f4f4982169f333c6 Patch-by: Greg Bentz Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix accessing the rpath dir from included modulesRomain Pokrzywka2012-09-281-1/+1
| | | | | | | The wrong variable was used when reading the module settings Change-Id: If35dc9694240a68393b24d7dba72520108cb9ac3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix rpath dir in forwarding module .pri fileRomain Pokrzywka2012-09-281-1/+1
| | | | | | | The module rpath should be the raw QT_INSTALL_LIBS, without the sysroot Change-Id: I4140929b38a589134872593e4ce35eaf7d1cd5b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make CMake tests significant on Windows.Stephen Kelly2012-09-271-3/+0
| | | | | | | | All bugs in the testing scripts are now fixed. Task-number: QTBUG-27087 Change-Id: I764257a9bbee7efeb9265449f6fa6a15bdeba883 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* CMake: Fix the generated location of static libraries.Stephen Kelly2012-09-261-0/+2
| | | | | | | | | We need to make sure to put the .lib file into the LOCATION property, not the .dll file, when building a static library. Change-Id: I8912abfd172d0939cd07ba02901ab58093ccefa1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* CMake: Specify the prl files when building with mingw.Stephen Kelly2012-09-261-0/+3
| | | | | | | | | As was done in ae6d4c77eb338be3f2189bfaffdcd3c38cc57333, but that commit missed the mingw branch. Change-Id: I1d76ed2f8070dced2749aabe889fee48c4086744 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* When trying to run cmake, don't show stderr output.Jan Arve Saether2012-09-241-1/+6
| | | | | | | It looks like the qmake process failed if cmake is not installed. Change-Id: I721796a602d8c572144e9d21be5d62b737698b73 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* make qmakespecs announce the compiler familyOswald Buddenhagen2012-09-211-0/+15
| | | | | | | | | | | | on the way to eliminate scoping based on the spec. gcc and msvc go as such into CONFIG, the other ones get the vendor prefixed, as most are mostly unknown and thus likely to clash with users' flags. Change-Id: Ie622f53d90e96dbf05ce7d8c638cd355f04fa20c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't set MODULE_BASE_OUTDIR unconditionallyOswald Buddenhagen2012-09-211-1/+1
| | | | | | | | webkit actually tries to set it, and after the syncqt invocation changes we were breaking it. Change-Id: I1ec740b7e96c972ca173f384529dde1fc7e7cc13 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move syncqt call to qt_module_headers.prfOswald Buddenhagen2012-09-212-15/+9
| | | | | | | | | | | | | for one, the syncqt invocation is qt module magic and thus simply does not belong into the generic default_pre file. second, this way the forwarding header generation is now linked to the rest of the build magic for a particular module, which is way less confusing for the unsuspecting developer. Change-Id: Idc8e420d3faf173d7fff4a41e6e1c59af15c3023 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make 'make check' work with non-installed prefix buildsOswald Buddenhagen2012-09-191-0/+3
| | | | | | | | add the appropriate environment to the command lines Change-Id: Ic9d3c60255be88f431213acd8c5e0ff55e014f5b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* factor out qtAddTargetEnv()Oswald Buddenhagen2012-09-192-29/+32
| | | | | Change-Id: Ib0517da54da98de4b1f2ee7d80bee22316231091 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless conditionals+branchesOswald Buddenhagen2012-09-192-7/+2
| | | | | | | | the surrounding TEMPLATE == vc* scope already implies vcproj, as dsp is not supported any more. Change-Id: I68363aca62e21135f42572040ccc7b189dcf32c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't make the outputs depend on $$QMAKE_DUMPCPPOswald Buddenhagen2012-09-191-2/+1
| | | | | | | | | | the variable can contain a complex command which would make a mess of the makefile. also, the tool doesn't change all that often, so it's not particularly useful to depend on the binary. Change-Id: I965d6555cb22bd6d5306b324f5cad0d747128e99 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove now unnecessary indirectionsOswald Buddenhagen2012-09-192-32/+16
| | | | | | | qmake's new parser can deal with this much more readable code. Change-Id: I772c9da4c9d049e2b332305f41496ed1196f60eb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Build tools in release mode if using -debug-and-release optionYuchen Deng2012-09-181-4/+1
| | | | | Change-Id: I1d4b69e6954526b4f999e248f4f2cde6a9da26cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* factor out qtAddToolEnv()Oswald Buddenhagen2012-09-182-16/+21
| | | | | | | so it's available for other users as well Change-Id: I2d5a14ae427575c07321ac532b13ee03308b837f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove 3rd parameter from qtPrepareTool()Oswald Buddenhagen2012-09-182-7/+2
| | | | | | | it's been superseded by the QTTOOL.* module stuff. Change-Id: I01c9fc3ebbb22111bfb03f82693c7cf08b5fc9d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove usage of QT_MAKEDLL in favor of the new QT_STATIC macroJoerg Bornemann2012-09-141-2/+0
| | | | | | Change-Id: I411cab0d92a8cad6b4f3676afe5cee050c4b789b Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Qt 5 API should correspond to Qt 4.8 on Windows, not 4.9.Stephen Kelly2012-09-131-1/+1
| | | | | | Change-Id: I052e76b4dcf0765d142567f748022d652072075c Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* move syncqt -check-includes handling to default_pre.prfOswald Buddenhagen2012-09-111-0/+2
| | | | | | | | this is where the syncqt calls for all modules happen Change-Id: I544e5fa6950c2babe56d78f5543d2c3262016687 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove left-overs of the borland compiler supportJoerg Bornemann2012-09-112-9/+0
| | | | | | | | Task-number: QTBUG-27184 Change-Id: Iae974c919871753500ca7e5cebdd5ef41fdd7a8a Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make the default Qt API be Qt 5.0'sThiago Macieira2012-09-081-0/+9
| | | | | | | | | | | | This means user applications will default to Qt 5.0's API. Higher versions or Qt 4 compatibility are opt-in. Also set the default for Qt's own build to be 5.0 on all platforms except Windows. On Windows, we need to set it to 4.9. Task-number: QTBUG-25053 Change-Id: I603e0fda4785e64e1413cd82153a89e48005aa40 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* centralize initialization of CONFIG in mkspecsOswald Buddenhagen2012-09-081-0/+1
| | | | | | | | "CONFIG += qt warn_on release link_prl" is in every single spec (though for link_prl there is one genuine exception and two apparent omissions). Change-Id: I72e1e315586af828eefa3b0b70998ab892ec3c1a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* centralize initialization of QT in specsOswald Buddenhagen2012-09-081-0/+2
| | | | | | | | there is no reason whatsoever to duplicate this so many times, and even less reason to have specs with a deviating default. Change-Id: Ia25836c079580adebc373697b8bd03598f79c69b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* enable depend_includepath by defaultOswald Buddenhagen2012-09-081-1/+1
| | | | | | | | | | | | DEPENDPATH is hard to get right, and consequently most projects have broken dependencies. the easy way out is just adding everying in INCLUDEPATH to DEPENDPATH, like we do ourselves in qt. if somebody wants to optimize, he can opt-out. Change-Id: I7fb56010728fd2b0d2b7d4d26386f366d414ba04 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* de-duplicate MODULE_DEPENDSOswald Buddenhagen2012-09-071-0/+1
| | | | | | | | | in modules which conditionally add dependencies it is hard to keep $$QT free of duplicates at definition time, so clean it up when we use it. Change-Id: Ia711e23bec3683525dfca80df4834e20b007ba1f Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* use each module's lib_bundle settingOswald Buddenhagen2012-09-071-1/+1
| | | | | | | | | ... instead of relying on the global qt_framework flag. Change-Id: Ie23f55788c26d732ada87aab7284c0a1fe0bfa28 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* generalize environment additions to tool invocationOswald Buddenhagen2012-09-071-18/+30
| | | | | | | | | | | | | | | | | | | foo.name = VAR foo.value = baz bar foo.CONFIG = prepend QT_TOOL_ENV += foo will add the respective environment assignment to the generated command line. if value is a list, the elements are joined with the shell's path list separator. the value must be in the final form (correct path separators and shell-escaped). if .CONFIG prepend is set, the generated command will prepend the new value to a pre-existing one. Change-Id: I62c6dfb3ec50ce73d3a85a2099275f92b57a52dc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* cache the right variableOswald Buddenhagen2012-09-071-2/+1
| | | | | | | | binary+depends is outdated; it's just command now Change-Id: Ic4617d760585e53a485920e843627d3f9707d6a9 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove declarative_debug feature (qmake)Kai Koehne2012-09-071-2/+0
| | | | | | | declarative_debug got superseded by qml_debug and quick1_debug. Change-Id: Id4c593d86a011223d2a735fb2a8c25e4ec70f53e Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Add a task number to ctest_testcase insignificationRohan McGovern2012-09-011-1/+1
| | | | | | | | | Make sure it doesn't get lost. Task-number: QTBUG-27087 Change-Id: I8b773cfa4b1b9ab5430096c2cff50911e84b73f7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Move the creation of the MODULE_DEFINES variable above the pri file check.Stephen Kelly2012-08-311-5/+6
| | | | | | | | | The MODULE_DEFINES is also used by create_cmake.prf, whether there is an existing pri file or not. In the case of QtWebKit at least, there is still a handwritten pri file present. Change-Id: I566c32a36aa6b84a455c2785c0da2bae57ea9091 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Temporarily mark ctest testcases as insignificant on WindowsRohan McGovern2012-08-301-0/+3
| | | | | | | | | The deployment of cmake onto Windows test machines caused test failures with no changes to the code under test. Mark all the ctest tests as insignificant until the failures can be fixed. Change-Id: If0cd4001ae6ec49fd38b9e0f97dd5326fddae433 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* cmake: use .exe suffix only on WindowsPeter Kümmel2012-08-281-1/+1
| | | | | | Change-Id: I36ba61bd4690de0bfe4a44e579eb554c82b53bb4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix CMake file INSTALLS with debug_and_release configurations.Stephen Kelly2012-08-282-4/+4
| | | | | | | Change-Id: Iad0161969e3632862102703fcc239358387e2181 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make it possible to use static builds of Qt with CMake.Stephen Kelly2012-08-271-0/+8
| | | | | | | | | | | Parse the prl files generated by qmake to get the link dependencies. They contain all the information we need, and they are the only location with all the right information. Change-Id: Id9dcc988f20a744297502eff008de085326cdbcf Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 22:25:24 +0000