summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Restore header installation on Mac to always install to $includedirv5.1.0Thiago Macieira2013-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | | We haven't fully agreed on whether headers should be in $includedir or not for builds with frameworks, since frameworks carry their headers inside. However, this change came too late for Qt 5.1 for us to assess the potential impacts -- it's known to break at least the cmake files we ship. So restore the build to the way it was. This is a partial revert of 6d61dfdbb74a2055438b999c6962f89cc3388eea. Partial because the old behavior was partially broken: it did not install headers for release builds. Now we always install (and in debug-and-release mode, we might do it twice). Task-number: QTBUG-32134 Change-Id: Ib84879c5a148d3717d16a7a90b2f5735fb5d80be Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* remove qt_no_framework_direct_includes from qt buildv5.1.0-rc2Oswald Buddenhagen2013-06-281-1/+1
| | | | | | | | | | | only the include statements found in public headers are constrained to work with this flag. our own c++ files and private headers can use other styles, which this flag breaks. Change-Id: Icb1ced17dc438083731049788ac28349c87ba7ef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* install qpa headers into frameworks as wellOswald Buddenhagen2013-06-281-1/+3
| | | | | | | | | they are a somewhat different kind of private headers, but follow generally the same logic. Change-Id: Ic6f42ed7061dde2ffd0e32b1d713354b58a20970 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* fix location of private headers in mac bundlesOswald Buddenhagen2013-06-281-1/+1
| | | | | | Change-Id: I2d9f117d4b25df878abc525499748ed1df9b9c18 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Deprecate Mac libc++ mkspecsTor Arne Vestbø2013-06-282-0/+4
| | | | | | | | | | | We handle C++11 and libc++ through c++11.prf now, so separate mkspecs are not needed. Deprecating them allows us to remove them in a later release. Change-Id: I4e525f445aeab88c926fa62cedef6aa9b32a7f55 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* mac frameworks: don't create bogus symlinksOswald Buddenhagen2013-06-261-1/+0
| | | | | | | | | | the entry for the normal headers already ensures that there is the correct version symlink. having an entry for the private headers as well is pointless, and in fact clobbered the symlink for the actual library. Change-Id: I2403761bf006b7bfa490ce85c7b0e46d5ef203c0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Replace win32-icc/qplatformdefs.h with the MSVC oneThiago Macieira2013-06-261-107/+1
| | | | | | | | | | | There have been fixes done to the MSVC qplatformdefs.h that aren't reflected in the ICC one -- specially the inclusion of windows.h. Since ICC is never tested, simply defer to the MSVC one and hope it's enough. Task-number: QTBUG-30839 Change-Id: I3c22638cc7fac3399d3606b1583608e95208df6e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix bundled header creation for debug buildsOswald Buddenhagen2013-06-251-10/+8
| | | | | | | | | the only case where we want to skip copying the bundled data (which is an optimization only) is the debug sub-build when we are actually building both debug and release. Change-Id: I1f3f67ccd9a64033b133ffaf58639cd9f7107c27 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* disable non-framework header install also for debug buildsOswald Buddenhagen2013-06-251-1/+1
| | | | | | | | i see no particular reason why debug builds should still get "normal" headers. Change-Id: I3625648549e8c234a365bab26823190ed2219cdf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* install private headers into frameworksOswald Buddenhagen2013-06-252-1/+8
| | | | | | Task-number: QTBUG-31641 Change-Id: Ifadc380c0a8983b2be93194e2e2257494b13dff8 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* don't needlessly do QMAKE_BUNDLE_DATA+=FRAMEWORK_HEADERSOswald Buddenhagen2013-06-251-1/+1
| | | | | | | there is no point in adding a structure we don't actually define. Change-Id: Ica43123f17eca6ebd4b5b7ec2526ebabef31c82a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* un-nest conditionalsOswald Buddenhagen2013-06-251-3/+1
| | | | | | | | it's cleaner, and it makes it possible to actually have a single else branch. Change-Id: I5ef917b678e2bd5a2face8ee19e942e5e952aa80 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* mac framework build: always set QMAKE_FRAMEWORKPATHOswald Buddenhagen2013-06-251-3/+1
| | | | | | | | | | | don't mess with the -F linker flag manually. qt headers include other headers via the canonical Module/Header syntax, which means that the compiler also needs the -F flag. QMAKE_FRAMEWORKPATH does exactly that. Task-number: QTBUG-29003 Change-Id: I5f4af1a462697cd6996c54436ccdb9fc2b216020 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Mac: Ensure that C++11 is always used when linking against a static Qt buildTor Arne Vestbø2013-06-241-5/+8
| | | | | | | | | | | | | If Qt was built with C++11, it links to libc++, and we need all projects that use Qt to link against the same library. Technically, we could do QMAKE_LFLAGS += -stdlib=libc++, but that hasn't been tested enough without also enabling C++11, so we keep the relationship between the two for now. Change-Id: Ic628bcbade60cc82f93707f372c2119c24d9dc8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* CMake: Fix test for value starting with -LStephen Kelly2013-06-211-1/+1
| | | | | Change-Id: I02ba45beca09c2eb1b1fbdc2a8f6efbc783bd72d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix LD_LIBRARY_PATH manipulation in uic calls not being make-escapedOswald Buddenhagen2013-06-201-1/+1
| | | | | | | | | | | the evaluator has the bug that function arguments are inherited. work around that by passing an explicitly empty 3rd parameter to qtAddTargetEnv(). proper fix upcoming in less critical branch. Change-Id: Ic45cc890abaa6271985590d4ebe02c96bff6dec4 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix rcc & uic .depend_commandsOswald Buddenhagen2013-06-153-11/+30
| | | | | | | | | | unlike the .command, the .depend_command is not executed by make via its chosen shell, but qmake itself via the system's native shell. consequently, it needs different path separators and no make-escaping. Task-number: QTBUG-31289 Change-Id: I480f815753632db6e8d4725f463f8a1fc59680a6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* always $-escape make commandsOswald Buddenhagen2013-06-151-1/+1
| | | | | | | | nmake needs %-escaping in addition to $-escaping, not instead. this has little practical impact, so it went unnoticed. Change-Id: I144b6142eec0151d83a22e0ac5ead7b0415cdafa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix command over-escaping in vcproj filesOswald Buddenhagen2013-06-151-2/+4
| | | | | | | | | the vs ide executes the commands verbatim, so they must not be make-escaped. Task-number: QTBUG-31289 Change-Id: Ie73fd5c4da5527c2d10bc94ccdf60f8a1ca21351 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* assemble the tool commands at use time, after allOswald Buddenhagen2013-06-153-10/+11
| | | | | | | | | | | the precise syntax depends on what exactly the command is used for, so we need to resolve it at the last moment. see followup commits. This logically reverts commits 6f4ff81380862ad0e788151b35d742f548241d5a and 731e6bece5cebe205ca47c1c078c7ac18984ba1c. Change-Id: If285c91d7521069be86d32593b5c2ae2027b3038 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Adjust the cmake files to find the dlls in the bin dir.Stephen Kelly2013-06-152-23/+42
| | | | | | Change-Id: I840f963c3648d123b31f79aa2c8902c0ad74e982 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* remove overquoting of extra compiler argumentsOswald Buddenhagen2013-06-122-4/+4
| | | | | | | qmake automatically escapes the ${expandos}. Change-Id: If74b6d2f2c68ff50785fdcbb66351122a273051f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove overquoting of extra compiler commandsOswald Buddenhagen2013-06-122-3/+3
| | | | | | | the commands are already quoted appropriately for the shell. Change-Id: I746bb5fba2cd6548c5dc7ef81087c69a200ecbb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix QMAKE_COMPILER fallback for clang specsOswald Buddenhagen2013-06-121-1/+1
| | | | | | | | in the actual specs, we also set 'gcc' for clang. Change-Id: Ifc6b27d56596f34c944205795d665f545d090f80 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Don't test existence of private header directories for mac frameworksStephen Kelly2013-06-101-1/+5
| | | | | | | | | | | These directories are not currently part of the Qt installation for mac frameworks. Task-number: QTBUG-31641 Change-Id: Ifef372cc2ebb692f9ae5a7b1f8dba5f683d1e7eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove the use of CMAKE_FIND_ROOT_PATH.Stephen Kelly2013-06-101-1/+1
| | | | | | | | | | | | This is actually a list in CMake, not a value to be prepended to paths. Specify the QT_SYSROOT instead to root the location of include directories. CMake will soon get a CMAKE_SYSROOT variable which will replace this. Change-Id: I239f69f127f3676a3835aa4f29638f44ef209819 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* mkspecs/qml_plugin: adding -nonrelocatable flag to qmldump callFawzi Mohamed2013-06-101-1/+1
| | | | | | | | | | | | nonrelocatable adds the full uri to the exported type information which is the correct thing to do for the qt plugins (and 99% of the cases). This way import bla.x 1.0 works correctly in the code model. Change-Id: Ia06873dd8b2ea4627e3297a98e8df87275ceaf73 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* redo include path logic for pre-generated headersOswald Buddenhagen2013-06-101-16/+32
| | | | | | | | | make the include dir in the source tree the "main" include path, as that's where the majority of the headers is. then selectively add the shadowed dirs. Change-Id: I03ad13cfcf77175c141b94d41b1221740d851faf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* reshuffle path setupOswald Buddenhagen2013-06-102-7/+8
| | | | | | | | | | | | | rename MODULE_PROFILE_DIR to MODULE_BASE_INDIR. force MODULE_BASE_OUTDIR to be always the shadow of the above. rename MODULE_BASE_DIR to MODULE_SYNCQT_DIR (the former is still recognized for backwards compat with webkit). the idea behind these changes is making the variable names and override possibilities reflect their actual use. Change-Id: Ica4062d7231a0ce13241670e0d0f43e6b1b97160 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use correct variable for library base pathOswald Buddenhagen2013-06-101-1/+1
| | | | | Change-Id: I6d621db2c4d5365a9c9a7284026b464e663a4cc6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* update some comments relating to forwarding module pri filesOswald Buddenhagen2013-06-102-4/+4
| | | | | Change-Id: I3486f949fee2ac977e3cde669188790e5f4b3167 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* allow modules to extend their MODULE_{,PRIVATE_}INCLUDESOswald Buddenhagen2013-06-101-0/+2
| | | | | Change-Id: I5e401edbe891846579cf6d9ff84427d16783923b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Strip the -L dirs when processing GL dirs for the CMake files.Stephen Kelly2013-06-061-1/+1
| | | | | | | | | | | | | The generated cmake files expect only the names of libraries, so the existence of directories causes erroneous fatal errors when attempting to use Qt5Gui, if pkg-config returns a -L entry from pkg-config --libs egl Change-Id: Iec50b4be68ab643c3c02abce2435a98e69955138 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* don't add absent private include paths to non-git buildsOswald Buddenhagen2013-06-051-2/+2
| | | | | | | | | all private headers are created by syncqt (and are thus in the source dir), so we can simply override the normal (build dir based) paths instead of extending them. Change-Id: I9c1f3344c401b481b3f3d2295515f1aabffaa9a0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix non-git non-shadow non-prefix non-qtbase buildsOswald Buddenhagen2013-06-051-1/+2
| | | | | | | | | | these builds usually assume all headers in the qtbase build (== source == install) dir, so the path for adding our pre-generated per-module include paths needs to be triggered explicitly. Change-Id: I57ec441d58cdf8186907ee6c36dce08daa206c49 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* run syncqt only for builds from gitOswald Buddenhagen2013-06-033-3/+23
| | | | | | | | | | | | | | | | | the logic in the configures was even trying to express that, only that nowadays we always ship syncqt, so the tests were kinda pointless. this frees us from the perl dependency for non-developer builds of packaged modules (except for webkit, which needs almost every scripting language on earth anyway). obviously, this requires that the packaging scripts run syncqt in the source dir before tarring up the sources. note that for repositories other than qtbase, the -version argument needs to be passed to syncqt. Task-number: QTBUG-29465 Change-Id: Ic929ab17a5de4b30fbf48b3aa9bfa3b4d2ef37d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move module master header generation back to syncqtOswald Buddenhagen2013-06-031-25/+0
| | | | | | | | | | now that we split out the part that depends on the project file, we can do it cleanly here. this way we can generate these headers at pre-build time already. and for git builds, perl is probably faster than qmake at this task. Change-Id: I343255c6de22329471a3ae2c2aac9ebeb160a501 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* split out dependencies from module master headerOswald Buddenhagen2013-06-031-5/+14
| | | | | | | | this will allow us the create the dependency list in a different way than the rest of the master header. Change-Id: Ib083fbbf6194cd9a161d669f860aaf32fd96d9d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless quoting of MODULE_*INCLUDES assignmentsOswald Buddenhagen2013-06-031-3/+3
| | | | | | | it would only cause trouble further down the line. Change-Id: Ied9ba8a1ecf36b77e1091c73564bd7601ea6a6b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move module version header generation back to syncqtOswald Buddenhagen2013-06-031-29/+0
| | | | | | | | | | | there is no particular reason for it being done by qmake. avoids that the logic is distributed over two source files, and allows us to generate these headers at pre-build time already, including not forwarding to a yet unexisting file (which would have a yet unknown location). Change-Id: I9c78ab425cf6f01d076c86fd1ee602626f231487 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Android: Fix Windows build with recent SDKEskil Abrahamsen Blomfeldt2013-05-311-0/+6
| | | | | | | | | | | Since the dx tool has moved in the SDK, we need to update our copy of it to also search in the new location for dx.jar. Task-number: QTBUG-31405 Change-Id: If093a9f51f33c5d8666919f516a3b336322a7169 Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Compile jar file on WindowsEskil Abrahamsen Blomfeldt2013-05-281-1/+1
| | | | | | | | | | | | Due to the way the DEX_CMD is formatted on Windows this would break every time. Since we actually bundle dx.bat in the repository, there's no need to check for its existence, so the easy fix is just to move the existence check into the code path where it's run from the SDK. Task-number: QTBUG-31405 Change-Id: If1aeb744d3abbd2488153b13aac401436965074e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
* add -compile-examples configure optionOswald Buddenhagen2013-05-261-2/+1
| | | | | | | | | | | | | | | | this overrides the magic that makes examples only install their sources in production builds. packagers may want to force the build of the examples, so they can package them up for demo purposes. this is actually why we formerly had the split between demos and examples ... Task-number: QTBUG-30788 Change-Id: I5633f69404c5aa6846f5496e8f161a273a7a7da3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Added the attribute "extends".Christian Strømme2013-05-221-1/+4
| | | | | | | | | | | Enables us to detect if a library should be added as a dependency or not. E.g., libQt5MultimediaQuick_p should only be added as a dependency if an application is using both QtMultimedia _and_ QtQuick. Task-number: QTBUG-30861 Change-Id: Id62642c40e2ecca7149d249f65c7b0c950898374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix Qt for Android build with recent SDK bundleEskil Abrahamsen Blomfeldt2013-05-211-0/+7
| | | | | | | | | | | | | | | In the recent revisions of the Android SDK bundle, the dx tool has moved from platform-tools/ and into build-tools/<revision-number> where revision-number is 17.0.0 at the moment. To enable building on these SDKs, we add detection for the dx tool and an environment variable which can be set to override the revision number to provide a way to build it against future revisions as well. Task-number: QTBUG-31199 Change-Id: I0d6a22163dc2e50f7a81cd3fe8f3d53c6335aaee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Check that files we expect to find actually exist when using a cmake package.Stephen Kelly2013-05-201-8/+35
| | | | | | Change-Id: If7c724daa85df5e29e410b8deb4e69beb43ee8ea Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* MSYS: use cp -f for QMAKE_INSTALL_*Ray Donnelly2013-05-202-0/+8
| | | | | | | | | | | | ... in mingw-using specs because msysgit doesn't provide install.exe and Windows doesn't care about Unix permissions anyway. Task-number: QTBUG-31147 Change-Id: Ic8032ca1a970ef41381852b6c5c372b805a124f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Only generate entries for private include dirs if they exist.Stephen Kelly2013-05-142-0/+10
| | | | | | Change-Id: I1d745adfbae371f8f1f76e954be98f4c2fd962e0 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* remove qtPrepareTool()'s ability to run batch filesOswald Buddenhagen2013-05-131-5/+1
| | | | | | | | | | | it was only meant to automatically support syncqt.bat, which is gone now. fwiw, invoking batch files from within msys Makefiles was broken to start with, as sh cannot directly run them. Change-Id: I435568c578ce79e46f4e230e985ca9a04b34ffff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless extension check from qtPrepareTool()Oswald Buddenhagen2013-05-131-1/+1
| | | | | | | | we never call it with an explicit extension, so this only complicates matters. Change-Id: Ib15180130359bb9575bf5dda564f8b817431618f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 23:44:11 +0000