summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* purge dead definesOswald Buddenhagen2012-11-011-3/+0
| | | | | Change-Id: I8770416a19fb0951c0096cedf3f36c3493437903 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless indirectionsOswald Buddenhagen2012-11-011-4/+1
| | | | | Change-Id: I2bf6d9a0352dea75f8fd596859ca7939685c9cec Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use .qmake.conf instead of sync.profile as "anchor"Oswald Buddenhagen2012-11-011-9/+2
| | | | | | | this is less expensive, as qmake already provides us with it. Change-Id: Ifb44ea9126e6b52c02025858c5d88032e7a6cc2a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* beef up qt_plugin.prfOswald Buddenhagen2012-11-011-2/+11
| | | | | | | it now defines the DESTDIR and creates an INSTALLS rule. Change-Id: I15a462ccad9acbe3521c352fa98327825dc27c05 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add qml1_{module,plugin}.prfOswald Buddenhagen2012-10-304-4/+23
| | | | | | | | | these are in fact thin wrappers around the qml2 variants, which got respective hooks. Change-Id: I1190856aea3f454b6f163e147d39c707a35ec4c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix tool invocation for -prefix + -framework builds on macxOswald Buddenhagen2012-10-291-5/+9
| | | | | | | | set DYLD_FRAMEWORK_PATH instead of DYLD_LIBRARY_PATH Change-Id: I9849f12063b8c7a45d040c087f4611c3a48180b8 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* let qt_tool.prf set up DESTDIROswald Buddenhagen2012-10-291-0/+3
| | | | | Change-Id: Ie30066566fe25859b2a661970b11a58e69361b1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce tool_plugin CONFIG flagOswald Buddenhagen2012-10-291-1/+3
| | | | | | | | while plugins for libraries need to follow the -debug-and-release switch, plugins for tools must follow the single-config approach of tools. Change-Id: I8a79e98034d2ff8b5d4e6191a9143c9472a5aa02 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* VERSION makes no sense for pluginsOswald Buddenhagen2012-10-291-1/+0
| | | | | Change-Id: I7af058eec1c5a0fdbd9848d2dc2f6bd76ca4747e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* namespace "module" pri filesOswald Buddenhagen2012-10-293-3/+3
| | | | | | | | we now have tool and soon plugin pri files. make them easily distinguishable. Change-Id: I8904e4182227a78060121e8712446bc43b1dd185 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* kill $$mod_component_base & $$mod_qmake_baseOswald Buddenhagen2012-10-294-18/+14
| | | | | | | | | | use $$MODULE_BASE_OUTDIR & $$MODULE_QMAKE_OUTDIR directly. this is a no-op, except that now module pris will be built in qtbase for all modules when building without -prefix - which is only consistent with all other artifacts. Change-Id: I2965b2c7a15aa9e82ba6017f5f4c0daa14b6e6fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* centralize module directory calculationOswald Buddenhagen2012-10-295-48/+29
| | | | | Change-Id: I5db529676b3287013008f28623a541fee1cde6a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* redo QT_PLUGIN_PATH assembly for non-installed executionOswald Buddenhagen2012-10-292-11/+7
| | | | | | | | | it is a bad idea to extract plugin paths from library modules. instead, just collect plugin paths from all known repositories. Change-Id: I527325f20e9cf98ae974997530af1b2893537e5d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* simplify determination of static plugin link lineOswald Buddenhagen2012-10-261-16/+1
| | | | | | | | qt_debug & qt_release are dead, so collapse the respective paths and use an existing function. Change-Id: Ie800be477186a6eab72682d367b24e83c3b9bbc0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* escape constructed command for makefilesOswald Buddenhagen2012-10-261-2/+5
| | | | | Change-Id: Iec7f2bd7b02d03bf6a99dde363a41578924e523c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move QMAKEMODULES addition to .qmake.super to qt_build_config.prfOswald Buddenhagen2012-10-262-14/+10
| | | | | | | | | | | | this is qt module specific magic that has no business in the generic default_pre.prf. a side effect is that every qt module now needs to have a .qmake.conf (unless it sets MODULE_QMAKE_OUTDIR, like webkit does). Change-Id: Id9e5f6eee2d8ec0c711e7217d9e1893fc9c88132 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix 'qmltypes' targetsOswald Buddenhagen2012-10-261-1/+10
| | | | | | | | should now actually work for all build types Change-Id: I2dc1f8231737c13e95ce8aab1330b4f063951547 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make qmltypes target properly respect debug vs. releaseOswald Buddenhagen2012-10-261-7/+11
| | | | | | Change-Id: Ia4f5ccb2b795a7594b74ea95aa0cc56a91aa7043 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use a qmake variable to pass the Qt version to the cmake version file.Stephen Kelly2012-10-191-0/+2
| | | | | | | | By depending on a simple variable instead of a more complex expression, we can more easily use this file from other contexts. Change-Id: Ib6ce1e2537f3e7ac19d25ad33454f25e85f71040 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 23:28:02 +0000