summaryrefslogtreecommitdiffstats
path: root/mkspecs
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>
* Compile fix for AIX with xlcAndy Shaw2012-10-161-1/+1
| | | | | | | | | The -qtls option is needed when building with thread support so it can use the local thread storage. Change-Id: I693d944efddac911fe03b2c9a6b06a28f112b54d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Remove addition of dependencies for static libraries.Stephen Kelly2012-10-161-38/+1
| | | | | | | | | | | | | | | | | | | | | The content in the prl file is not compatible with what CMake expects in the value of the IMPORTED_LINK_INTERFACE_LIBRARIES property. That property expects a list of IMPORTED targets or full paths to libraries. The prl file gives us a whitespace separated string of content suitable for passing to ld, that is, it contains -L and -l content. As this would take a lot of error prone parsing in cmake code in order to resolve the content to a list of full paths to libraries (which can be processed by any cmake generator), it's better to remove the code until qmake is able to generate a list of full paths. Change-Id: I72fe8e862b7f3bd25a7f9a03db94d2e9b815d08a Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.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>
* Define QMAKE_LIBS_OPENGL_ES2 for win32-g++ mkspec.Jason Barron2012-10-151-0/+1
| | | | | | | | Needed to compile Qt with ANGLE. Change-Id: Ie88aeff21dfeddbfcb6ef14e453c8dc077896a1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* android: set QMAKE_COMPILERArvid Picciani2012-10-131-1/+2
| | | | | Change-Id: I5b38bf94f0f0d4080b8d355013441c1805524d71 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* android-qt: fix build for jellybeanArvid Picciani2012-10-131-1/+5
| | | | | Change-Id: I2a52770502ec6e70ae0e3928d98c6c573f773579 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* android-eglfs: open the correct fb device for reading attrsArvid Picciani2012-10-131-1/+68
| | | | | Change-Id: Icedcab50379834fa3456d0e18aaef8a4dd9cf949 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Remove the -falign-stack option from ICC's mkspec.Thiago Macieira2012-10-131-1/+1
| | | | | | | | | | | | | | | This option was necessary in early ICC 12 releases because of a difference in interpreting the ABI requirements with GCC. According to ICC devs, GCC changed the ABI on its own to require 16-byte-aligned stacks on i386. It looks like this option has been the default in later ICC 12 releases. At least 12.1 update 5 has it by default. ICC 13 does not have the option anymore but accepts it silently for backwards compatibility. Change-Id: Id8bb4c250718eef2f02dc97bd47a0efd95b272fc 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>
* Generate ';' separated libraries in prl files for CMake.Stephen Kelly2012-10-091-3/+2
| | | | | | | | | | | | | | | | | | The generated CMake files need to pass ';' separated libraries to the IMPORTED_LINK_INTERFACE_LIBRARIES property, otherwise we get errors such as this: http://testresults.qt-project.org/ci/QtTools_master_Integration/build_00386/win32-msvc2010_Windows_7/log.txt.gz (grep for QtCore5.lib.lib) Rather than a naive and error prone replacement of whitespace, generate the appropriate ';' separated content directly in the qmake prl file. Change-Id: I8eb5e233a0318b57ec74b86d910583ff99c29415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Introduce a Tegra2 mkspec to the device specsThomas Senyk2012-10-082-0/+73
| | | | | Change-Id: I16275f2f289a78e3217d765934b999b188005c14 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Simplify the imx6-device-mkspecThomas Senyk2012-10-081-23/+13
| | | | | | | | | | | | This change is possible due to commit 18654058 As it's now possible to use configure's -sysroot without gcc's --sysroot, it's possible to use configure's pkg-config setup (which comes with its -sysroot). This gives the possibility to simplify the mkspec and be in line with the other device-mkspecs Change-Id: I0f34ec2c5c7b06334ad3c1605001c0803272b027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@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>
* native android support with eglfsArvid Picciani2012-10-043-0/+303
| | | | | | | | | | | | | | | | | | | | | | | Enable eglfs build against any android > 4 tree, linking to native libs without emulation layers, running on top of surfaceflinger. No GNUs where harmed in the process. Yes, any android. Tested on maguro, tf300, eeepc-x86 x86-64 compiles but broken elsewhere. You don't need an Android.mk, but you must compile from within a shell setup with androids "lunch" or an equivalent that set TOP and OUT. Since we do callbacks to androids build system, the same env restrictions apply (must use gnu bash, and gnumake 3.81) Done-with: Samuel Roedal <samuel.rodal@digia.com> Done-with: Robin Burchell <robin+qt@viroteck.net> Done-with: Brian Avery <brian.avery@nokia.com> Change-Id: Iec0178cdeadbeefc79e4fe6ef449d399ac8ca666 Reviewed-by: Samuel Rødal <samuel.rodal@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>
* Define QMAKE_EXTENSION_STATICLIB for MSVC mkspecs.Jason Barron2012-10-034-0/+4
| | | | | | Change-Id: Ia652001f9be67b0c509495c054875ca1ef8fc049 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.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>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-013-3/+15
| | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Change-Id: Iba300e9cb82f34043e7b36f8e45287a1aed2a1a5 Original-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-262-0/+34
| | | | | | | | | 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>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-22150-3685/+3685
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* announce the android platform in the respective specsOswald Buddenhagen2012-09-211-0/+2
| | | | | Change-Id: I55c8d9fe4160c37eec6073894481e313e4dea191 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add missing maemo platform announcement to n9 specOswald Buddenhagen2012-09-211-0/+2
| | | | | Change-Id: I24855dc3fdfcc19a81f7e030c9dfbbdddd2bb552 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* claim that mingw is a platformOswald Buddenhagen2012-09-211-1/+1
| | | | | | | | it's mostly win32+gcc, but sometimes there are library differences, so it makes sense to have an own platform flag for it. Change-Id: I985f0dd39a47bfc16f10f4b4a9c168874ae2f20d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make qmakespecs announce the compiler familyOswald Buddenhagen2012-09-2155-0/+123
| | | | | | | | | | | | 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>
* define QT_OPEN_LARGEFILEJohn Peterson2012-09-181-0/+1
| | | | | | | | it must be defined, even if zero Task-number: QTBUG-27232 Change-Id: I950ef61ede197af9c2d8aedddd712cc6d4cc745b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix the comment for the maemo mkspecs since it does not work for fremantleLaszlo Papp2012-09-141-1/+1
| | | | | | | | See the bug QTBUG-18361 for details. Change-Id: Idbe2043c07cca795e8e2fca8204993dfb0a11988 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 04:00:40 +0000