summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* iOS: Wrap Xcode projects in Makefile for convenience and subdirs supportTor Arne Vestbø2013-08-133-16/+39
| | | | | | | | | | | | | | | | qmake expects the generator to be the same for each node in the tree of subdirs, including the leaf projects, which caused failures when qmake tried to recurse out to the leaf projects and run 'make', when the leaf project was an Xcode project. We now wrap the Xcode project in a meta-makefile that just calls out to xcodebuild to do the actual work. This allows us to get rid of the hacky generator detection, and use the macx-xcode mkspec instead of setting the generator, which is much cleaner. Change-Id: I2fed6a4dd6343b6a320eb459ecae824553bff459 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* iOS: Link to platform plugin when application requires gui-privateTor Arne Vestbø2013-08-131-1/+1
| | | | | Change-Id: I53e955f9673bd6560f44400a8fa877917107c353 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Integrate gcov support into Qt build system.Sergio Ahumada2013-08-071-0/+31
| | | | | | | | | | | | To instrument a Qt application or library with the gcov coverage tool, do `CONFIG+=gcov' in the application .pro file. To instrument Qt itself with gcov, use the `-gcov' configure option. Change-Id: If24e91d95318609b0df1a76ed6d679bd92bcaab2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* eglfs/imx6: Implement platformDisplay() in hooksJan Arne Petersen2013-08-061-0/+6
| | | | | | | | Return the native display created in QEglFSImx6Hooks in platformDisplay(). Change-Id: I2b28ac66dce12a1054fc2f78dbfad0723f8e5688 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* iOS: Move platform plugin linking logic into iOS-specific qt.prfTor Arne Vestbø2013-07-302-22/+24
| | | | | Change-Id: I54350c8df3fe4bf20fc59cd42a28458018664eef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-235-63/+74
|\ | | | | | | | | | | | | Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
| * don't install mac bundles atomicallyOswald Buddenhagen2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as that causes debug+release installs to overwrite each other's postprocessed files. introduces CONFIG+=sliced_bundle, which instructs qmake to create file-by-file install commands. we don't know whether people are not putting files outside qmake's knowledge into the bundle build dir, so this mode is not necessarily backwards-compatible, and thus off by default. Task-number: QTBUG-28336 Change-Id: I23e90985ccd3311f0237ed61aadca6d7ed8325b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Don't check for the existence of private include directories.Stephen Kelly2013-07-221-5/+12
| | | | | | | | | | | | | | | | | | | | | | Some packagers don't want to install the private headers. Check the existence of private headers only if the 'Private' component is specified when finding the package. Task-number: QTBUG-32466 Change-Id: I1fdbfb25e8ce485cd051564b937f766b2733741a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Fix wayland-scanner to work with CONFIG+=silentJan Arne Petersen2013-07-201-53/+53
| | | | | | | | | | | | | | | | Use "_" instead of "-" in variables so variable replacement works properly. Change-Id: I2b17dca8f2351bc0933c165017f3fbb9393b0514 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Use the compilers used by Qt for the CMake tests.Stephen Kelly2013-07-191-0/+2
| | | | | | | | | | | | | | | | Task-number: QTQAINFRA-609 Change-Id: I32ad70a4b31baf1815c2c08ac16e35e78052e569 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Only run the cmake test in the install location if not already done.Stephen Kelly2013-07-151-4/+6
| | | | | | | | | | | | | | For developer builds, there is no need to run the test a second time. Change-Id: I3564874cb2e9d6cc243e25a89ecd7f89df23b0bd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 20:08:26 +0000