summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Make sure deprecation warnings don't cause errors with -WerrorThiago Macieira2013-08-271-3/+4
| | | | | | | | | | | It sounds like a good thing to have this warning, but for future-proofing we can't have it. The system libraries might change and add deprecation marks (OS X does that often). If they do that, we don't want poor developers to have to fix all warnings before they can build Qt again. Change-Id: I4ff317da0de596c470bb1efe6e59bcf70aeec8fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Set an upper range of compiler versions for -WerrorThiago Macieira2013-08-231-11/+13
| | | | | | | | | | | | | | | | | This allows us to go back to older versions of Qt with newer compilers, that didn't exist when those versions were released. It also allows someone upgrading their compiler and not being faced with having to fix all warnings before Qt compiles. This commit whitelists the following compilers: * Apple Clang versions 4.0, 4.1 and 4.2 (OS X only) * Intel Compiler versions 13.0, 13.1 and 14.0 (Linux only) * GCC versions 4.6, 4.7 and 4.8 (all OS) Notably, Clang on other other OS besides OS X and MSVC are missing. Change-Id: I665160d40a59336da1904f2a6c1eda543e592b48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix bootstrap class path warning (java)Frederik Gladhorn2013-08-221-4/+5
| | | | | | | | | | Due to forcing java 6 we need to pass the bootstrap jar file (android.jar). https://blogs.oracle.com/darcy/entry/bootclasspath_older_source Change-Id: I530a7e2a7df40813011a6dde93d6ccc3aaaa61d6 warning: [options] bootstrap class path not set in conjunction with -source 1.6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-2160-1143/+6
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| * Give the extra compiler a unique name for the vcproj generationMat Sutcliffe2013-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The first word of the .name variable of each extra compiler is used as a key in a container that keeps track of them. See also: qmake/generators/win32/msvc_objectmodel.cpp: VCProjectSingleConfig::filterForExtraCompiler qmake/generators/win32/msvc_vcproj.cpp: VcprojGenerators::initExtraCompilerOutputs Task-number: QTBUG-32912 Change-Id: I7ea5c58884db559621f50740075b7f2e4e3ef7f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * suppress error output from pkg-configOswald Buddenhagen2013-08-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | under normal circumstances, any errors will be noticed already by the pkg-config --exists call, which is silent anyway. therefore this doesn't change anything in normal qmake usage. however, lupdate's and creator's evaluators skip the --exists calls and subsequently invoke the normal query, which then prints useless noise to the terminal. Task-number: QTBUG-28159 Change-Id: I536412060f3830aafeb0587f855cd6af11227bca Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Remove not supported mkspecs for Windows CE.Bjoern Breitmeyer2013-08-1558-1142/+0
| | | | | | | | | | | | | | | | Windows CE 5 and the depending Windows Mobile is not supported. Change-Id: I81b9599f837590a1375b6340e58c47b478c079ba Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | don't include non-framework include paths when using frameworksOswald Buddenhagen2013-08-201-5/+4
| | | | | | | | | | Change-Id: Ia72d5b611b9870b83846299bc7642841b09b84b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-1628-74/+122
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1428-74/+122
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| | * Fix SONAME handling on androidStephen Kelly2013-08-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the SONAME to the library name without the major version number appended, as android does not have the versioned symlinks. Change-Id: I41c504869019a393a3f112b2f7fc81c7ad5afa1c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
| | * gdb_dwarf_index: Use a sed call that's more POSIX-compliant.Raphael Kubo da Costa2013-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed versions other than the GNU one often default to being POSIX-compliant, in which case "+" (with and without escaping) is always an ordinary character. Achieve the same functionality in a way that works with both GNU and BSD seds by using "xx*" insted of "x\+". Change-Id: I1d2576a8c0e17b31f01a44d9632c57991e53780d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Android: Fix crash when compiling release mode for armv5Eskil Abrahamsen Blomfeldt2013-08-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building in thumb mode for armv5 applications will crash with SIGILL on startup. This has been observed on armv7 devices and emulators. It could be a bug in the gcc 4.4.3 toolchain, but since the other toolchains in the NDK have other bugs that make it impossible to use them for building, we need to disable thumb until the cross-compiler has been fixed. Task-number: QTBUG-31338 Change-Id: I22dd228158ef8c43b0b1d6e549d5725c1930536b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * Add Info.plist templates for the macx-icc makespecTor Arne Vestbø2013-08-052-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31355 Change-Id: Iea2ac2a072bbd2c0104f0704a86503c0982fb886 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * Update Info.plist templates to use the current standard plist format.Jake Petroules2013-08-0218-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | Change the version number to 1.0, and use the public doctype. Change-Id: I9b071c80c410c31c38813c4447edd7b186226fab Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-263-7/+11
| | |\ | | | | | | | | | | | | Change-Id: Ic5a232260a6c8ee71f9ff91e820f54c36ab6b15a
| | | * Use absolute path in the /usr move workaround if -libdir is specifiedStephen Kelly2013-07-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68d087b15839418008db5bf1c0c76ca303245519 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | | * Move the cmakeRelativePath function to cmake_functions.Stephen Kelly2013-07-242-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32570 Change-Id: I05bbf7084ef8501bf17698f2ecc1cf3d8fd4d460 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | | * CMake: Add a clean_path before returning a path.Stephen Kelly2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $$path may already be absolute, so prepending a slash may result in //usr/lib, for example. Task-number: QTBUG-32570 Change-Id: If7a4f6fbec0216404cfe48c1da62d21d75b3e272 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | | * CMake: Remove copy-pasto for the IMPORTED_LOCATIONStephen Kelly2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32579 Change-Id: Ibe9dd92824091989168fca842a59b556937b1f08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | Android: Add QT_NO_PRINTER to DEFINESSergio Ahumada2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Printing is not enabled for Android. Change-Id: I5f589a036355fd63a7616fd57eeba1354d91281b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * | Fixed mkspecs/devices/linux_device_post.conf for non-arm platforms.Tomasz Olszak2013-07-246-10/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Now arm specific -mfloat-abi flag is added to compiler flags only for arm architecture in linux_arm_device_post.conf. Change-Id: Ie77ac6e0717d9d1fd9c14e1d6a26e86f08ab418c Reviewed-by: Jarosław Staniek <staniek@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | / Make java xlint warnings visibleFrederik Gladhorn2013-08-161-1/+1
|/ / | | | | | | | | Change-Id: If347c920df5e5aa0924a9f8d626d7e3e017d3536 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 14:16:35 +0000