summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | move invariant CONFIG flags out of the configuresOswald Buddenhagen2012-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we now have qt_build_config.prf which can contain static code. Change-Id: I3f0ae142fdc5ffb4e1d25e628e809ba15b5f0ac4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | remove pointless messing with CONFIG+=fix_output_dirsOswald Buddenhagen2012-11-021-1/+0
| |_|/ |/| | | | | | | | | | | | | | | | | | | | the function is automatically performed by debug_and_release.prf, regardless what we do with this flag. Change-Id: Iddec69b35e0e905fdf4133ee240af37d3a8ada0b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | let static plugins have "module" pri filesOswald Buddenhagen2012-11-012-31/+15
| | | | | | | | | | | | | | | | | | | | | ... and use them in qt.prf instead of (not) maintaining hand-coded lists. Change-Id: Ia21f7864eaf3ca92fa75f23876f71075d0521f4b Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | Use the new QMAKE_XSPEC to get the mkspec.Stephen Kelly2012-11-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I7f307ffe0954464f68192f9f3781bdb206f87809 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | 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>
* | Mac: Set minimum version to 10.7 for clang-libc++Morten Johan Sorvig2012-10-2413-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | Clang's libc++ does not support 10.6. Add mac-minimum-version.conf which sets the version to 10.6. Set the version to 10.7 in the clang-libx++* mkspecs. Change-Id: I494d0d24b0d73d9395e9d5406c8c63c9af87f8cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Enable HiDPI mode for retina displays.Morten Sorvig2012-10-239-0/+18
| | | | | | | | | | Change-Id: I3b62ec9c3bf5e53c6ec056b95c52cfeb6ce5b61f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Use a qmake variable to pass the Qt version to the cmake version file.Stephen Kelly2012-10-192-1/+3
|/ | | | | | | | 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>
* CMake: Remove content from else() and endif() commands.Stephen Kelly2012-10-191-3/+3
| | | | | | | | | Having them empty is the common style and is less noisy. Change-Id: I30c0c4d297a7bdb373a57a636f4fdbc488a69fcd Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org>
* 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>