summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* macx-xcode: Use Info.plist templates from original makespecTor Arne Vestbø2013-07-153-40/+7
| | | | | | Change-Id: I178f1ce7cea1228d3d38b3517f9dcecc3c2d4c6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Remove Mac libc++ mkspecsTor Arne Vestbø2013-07-154-131/+0
| | | | | | | | | | | | Should not be needed anymore (as of 3d0a60aaa4077a8), as we now use libc++ automatically when C++11 support is enabled. The specs were deprecated in Qt 5.1 (commit f7a7859a7). Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I6653f191b99f7c51c3f02a62c6ef68591b2dfa70 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-07-1230-258/+360
|\
| * Merge branch 'stable' into devSergio Ahumada2013-07-1130-258/+360
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| | * Refer to Apple products by their actual names.Jake Petroules2013-07-1014-14/+14
| | | | | | | | | | | | | | | | | | | | | This is a comment-only change. Change-Id: I2432b1135ef21d781c9486df06699710f2696ee3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * Always use forward slashes in paths passed to cmake.Stephen Kelly2013-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Otherwise it issues many warnings. Change-Id: I072afc65eed3f2549e5e5894f8d290c792025e4c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * CMake: Fix handling of insignificant_test.Stephen Kelly2013-07-101-2/+3
| | | | | | | | | | | | | | | | | | | | | The test should still be run, even though it is insignificant. Change-Id: I6a3853e2b0e9670152b4f329dbceed2986a7e008 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * don't pass -indexdir during prepare_docs phaseOswald Buddenhagen2013-07-081-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the forward-referenced directories don't exist yet, so we get pointless warnings. in fact, this is why we do a multi-pass build in the first place, and consequently using indexes during the first pass is illogical. Task-number: QTBUG-32152 Change-Id: I66bf6b43238827e87cb8bf6932d581b808c1032d Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * make requirement for -private suffix explicit, take 2Oswald Buddenhagen2013-07-052-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the previous attempt broke ActiveQt, as it actually has public modules without headers (they are provided by a common base module). so explicitly mark the internal modules as such instead of applying heuristics. Change-Id: I8d8a2ee66f02c3444da2036a497e7f382f089f62 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Android Windows: Adjust to new SDK layoutRay Donnelly2013-07-042-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google moved dx.bat into a new build-tools/VERSION folder meaning our dx.bat no longer found dx.jar. Fix this by passing into our dx.bat, the location of the real dx.bat Removed hardcoded 17.0.0 and %ANDROID_BUILD_TOOLS_REVISION% path searches. Change-Id: I91c12c01745d6f12edbd126102b8f06eba291402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * add support for Visual Studio 2013Joerg Bornemann2013-07-042-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add mkspec win32-msvc2013 and make VS 2013 known to configure and qmake. Change-Id: I6e63a4d679727a8a3f068f377956185996d72bce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Merge "Merge branch 'release' into stable" into refs/staging/stableSergio Ahumada2013-07-043-2/+5
| | |\
| | | * Merge branch 'release' into stableSergio Ahumada2013-07-033-2/+5
| | | |\ | | | | | | | | | | | | | | | Change-Id: I982a86e1b99e3ae629e8c5667bc7bdf9f4018b2e
| | | | * make requirement for -private suffix explicitOswald Buddenhagen2013-07-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a private module was used without the suffix, it would not add any include paths, but the library would be still added. as long as the includes were written as <Module/private/Header>, this would not become visible, as the public modules would add the common include path ... however, this soon won't be the case for mac frameworks any more. this change makes the problem visible early on. Change-Id: I8b1a20313ad736cb49507f07fa623e9aa812f651 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * headersclean: process private modules correctlyOswald Buddenhagen2013-07-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51c8ee0db31b35e1d991411fe0b03da6665e9a84 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * 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>
| | * | | correctly fix compilation of NEON_ASM sourcesOswald Buddenhagen2013-07-041-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ef74a763a726829bfc26224d82acff207fdc8bb, as assembler files in SOURCES break compiling with -pch, as we don't create a respective PCH. instead, compile assembler code with QMAKE_CC, not QMAKE_CXX. the reason why this change is needed in the first place is not clear to me, but i guess that CXX defines some c++-related macros when preprocessing the file, which breaks further down the line. this is counter-intuitive, as the g++ frontend should treat the same sources the same way as the gcc frontend (differences should be limited the the ld invocation). Task-number: QTBUG-29765 Change-Id: Ic0116b3a5fa621f12ac41cadf3062ff00b538e85 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | | Add path to the headers in frameworks to the include dirs.Stephen Kelly2013-07-031-0/+15
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32134 Change-Id: I30a2db3363d995ecb6e2b06c66080f7430174868 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | Hardcode the VERSION reported by qmake instead of calculating it in cmake.Stephen Kelly2013-07-031-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia83f995a64a56c845bbce1a90702a98fc83a1401 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Add some return() to remove indentation levels.Stephen Kelly2013-07-031-75/+80
| | | | | | | | | | | | | | | | | | | | Change-Id: I48dc013fece0f4758ad54342f97ed51b33a9c2ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Add a unit test for testing Qt in its install location.Stephen Kelly2013-07-023-92/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt CI system runs the unit tests after installation, but with the qmake in the build directory. This means that the installed content is not unit tested. Add an additional cmake unit test to test the files in the install location. The new test is marked insignificant for now until the true effect on the CI system is known. Task-number: QTBUG-27315 Change-Id: If9f12e88cfc741946cfabc25dbf789a11a2af4b8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-284-111/+10
| | |\| | | | | | | | | | | | | Change-Id: I53112e20a65b7d706755b4a22622979f3b91a2c2
| | | * 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>
* | | | Add osx and darwin scopes to qmake.Jake Petroules2013-07-114-5/+11
|/ / / | | | | | | | | | | | | | | | | | | This gives us better consistency across the Qt ecosystem. Change-Id: Ie12ebb6e8c826ed2e0445eb37de0b79595da41c2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | macx-xcode: Use correct replacement key for bundle identifierTor Arne Vestbø2013-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The 'BUNDLEIDENTIFIER' key ensures that we generate an rfc1034 compatible identifier. Change-Id: Ic5cefb8ae888d768dd793813e7ee3c23c9a5582a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | Add the same flags for the c++ compiler as they are already defined for the ↵Wolfgang Bremer2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | c compiler Change-Id: If3d42a6b3ad361c8a11b4eee8dd17be0e58d9192 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2714-88/+121
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-254-20/+24
| |\| | | | | | | | | | Change-Id: I4c0ae2ac1c10d4d50c03625c802d981b7850ed6f
| | * 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>
| * | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-257-45/+86
| |\ \ | | | | | | | | | | | | refs/staging/stable
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-207-45/+86
| | |\| | | | | | | | | | | | | Change-Id: I94bb158562ae6b80a87b40139d7302ea7b9b9aa8
| | | * 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>
| * | | Make the macx-xcode spec a wrapper around the default specTor Arne Vestbø2013-06-243-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... except for MAKEFILE_GENERATOR = XCODE. This means the spec no longer hard-codes g++, and will work regardless of whether the default spec was clang or g++. This require us to set QMAKE_XCODE_GCC_VERSION properly for GCC, so that additional compilation flags passed by Xcode will match the actual compiler used. Task-number: QTBUG-31713 Change-Id: If65140a7471cd16f483036742f1d5b86d0485c52 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:01:58 +0000