summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Rename the N9 device mkspecs folder to match the *-maemo* regexLaszlo Papp2012-09-142-0/+0
| | | | | | | Change-Id: I0c7b74d67f44d776a74671d38bbc0f2424974c2c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Romain Pokrzywka <romain.pokrzywka@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.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>
* Remove support for Intel C++ 7.1 and 8.0Thiago Macieira2012-09-142-172/+0
| | | | | | | | Those compilers are old and untested. Qt is only tested with ICC 12.1 and 13.0. Change-Id: I3a5fa9452de27a61ee087700cc054a76fe4160ee 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>
* Add QMAKE_CXXFLAGS_CXX11 & QMAKE_LFLAGS_CXX11 flags of win32-g++Yuchen Deng2012-09-131-0/+2
| | | | | Change-Id: I752c37b581af6d5ea171ec99ef0afe29ffa78002 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update iOS 'clang' mkspec for Xcode 4.5Ian Dean2012-09-111-2/+2
| | | | | | Change-Id: If472bd60fa8ddc9d3af394a904a52290a1c308b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Removed some unused #defines from iOS qplatformdefs.hIan Dean2012-09-111-3/+0
| | | | | | | | | Removed QT_GUI_DRAG_DISTANCE & QT_GUI_DOUBLE_CLICK_DISTANCE from the iOS qplatformdefs.h header as these values are dependant on display pitch and should be calculated by the platform plugin. Change-Id: I00c377483ad73cad19a2fe729cb3f45e9271e3ac Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.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-0892-91/+62
| | | | | | | | "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-0894-93/+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>
* remove useless TEMPLATE assignments from specsOswald Buddenhagen2012-09-0891-91/+0
| | | | | | | "app" is the built-in default anyway Change-Id: I4f581ee5b81aee08860dbdda5d863943bceafb1b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* adjust specs to the new target mode handlingOswald Buddenhagen2012-09-0892-85/+67
| | | | | | | | | | | | not strictly necessary, but nicer. QMAKE_PLATFORM (and thus CONFIG) now also contains the name of the OS, and its family (if applicable, e.g., bsd). this also adds more feature search paths. Change-Id: I3ab971e6e3b2b32cae53b95e4bc67a86688bc5cb Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> 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>
* QNX: Move qpa-based mkspecs out of the unsupported directorySean Harmer2012-09-048-6/+6
| | | | | | | | | | | | RIM is committed to supporting Qt on its platforms and the port works well. Change-Id: Id6bfea2dbc178800adad89d436ce31c40d3eb652 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix indentation.Morten Sorvig2012-09-049-9/+9
| | | | | Change-Id: I0e53df9e1903c8cdc79d50c16cfe7f90ae6e1d6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Tidy up QMAKE_LFLAGS in qnx mkspecsSean Harmer2012-09-032-5/+1
| | | | | | | | | | | | We do not need to include -lang-c++ more than once in QMAKE_LFLAGS* variables. The fact that this was not appearing more than once was due to QMAKE_LFLAGS being overwritten (rather than appended to) in qcc-base-qnx.conf and a weird coincindence in qmake's code to dedupe libraries passed in to QMAKE_LFLAGS. The deduping was working based upon options beginning with "-l", including the -lang-c++ option here. Change-Id: I983f216c0e362a9fe6a924074c5d84aaa659a14f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* Report a FATAL_ERROR if trying to use Qt 5 with CMake < 2.8.3.Stephen Kelly2012-08-311-0/+4
| | | | | | Change-Id: I76cad71c96a5def170715568e6a16b1168cbb2cd Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.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-272-41/+35
| | | | | | | | | | | 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-23 23:09:59 +0000