summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
...
| * Update the ICC spec on Linux to actually compile stuffThiago Macieira2013-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | I had the -fPIE option in my personalised "linux-icc-optimised" spec, so I never noticed it was missing in the standard one. I have no idea when -rpath-link is necessary. It isn't for me. Task-number: QTBUG-34425 Change-Id: I54b2fb8cda10b9197d81b5630b1d29b8c338d96a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * dbuscommon.pri: Fix source file dependencyMichael Krasnyk2013-10-301-0/+1
| | | | | | | | | | | | | | | | | | Make already the creation of the generated cpp file depend on the creation of the generated h file, which transitively ensures that the cpp won't be compiled before the h is there. Change-Id: Idd3aec8d72dac341e835a3d1ef8f2986dbc1ab9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * iOS: Build libs (including Qt itself) for both simulator and deviceTor Arne Vestbø2013-10-301-45/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conceptually a Qt for iOS SDK or source build should support building for both simulator and device, based on the same qmake binary and Qt libraries. Qt Creator or Xcode should then be able to use the same Qt version while still building for a single target at a time. This applies to user libraries as well, which shouldn't require switching to a different Qt when changing target platform from simulator to device. We achieve this by using Qt's exclusive_build feature, where we build for the two targets in parallel, and then teach Xcode how to choose the right library dynamically at build time. Change-Id: I06d60e120d986085fb8686ced98f22f7047c4f23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * iOS: Build simulator libraries with suffixTor Arne Vestbø2013-10-302-3/+12
| | | | | | | | | | | | | | | | Makes it possible to join two separate builds, and opens up for using exclusive builds to do this. Change-Id: I87ccbdd55511fdfbef3fe8b581f40525ebf077ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * iOS: Set ARCHS in Xcode project for both simulator and device SDKsTor Arne Vestbø2013-10-281-7/+13
| | | | | | | | | | | | | | | | Removes the need to pass ARCHS to xcodebuild for simulator builds. Change-Id: If15e9d387c416c5c9f83c50f5903ae0cd517ff34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Rewrite qmake's exclusive-build featureTor Arne Vestbø2013-10-257-98/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to compute the default exclusive build directory, eg 'debug', at configure time, and then set OBJECTS_DIR, MOC_DIR, etc to include this hard-coded default exclusive build directory. We then had to run a post- process step where we replaced the 'debug' part with the current actual exclusive build pass, eg 'release', resulting in long-standing bugs such as QTBUG-491 where we end up replacing parts of the build output dirs that were not part of the original exclusive build directory. We now set the OBJECTS_DIR, MOC_DIR, etc defaults in configure like before, but they do not include any exclusive-build information. The exclusive build directory is handled as a separate step in default_post where we adjust all entries in QMAKE_DIR_REPLACE to be exclusive directories. For backwards compatibility the new exclusive build behavior is only enabled for variables named by QMAKE_DIR_REPLACE_SANE, which for Qt itself applies globally to everything but DESTDIR, and for libs and tools also applies to DESTDIR. The reason for leaving out DESTDIR in the general case is because many tests and examples assume the old behavior for DESTDIR. A side effect of including all the other variables for Qt libs and tools is that the PCH output dir will be uniformly set, which has been an issue on Windows in the past. The addExclusiveBuilds function now takes two or more arguments, each argument being the key for an exclusive build, which can be customized eg. using $$key.{name,target,dir_affix}. Passing more than two arguments results in three/four/etc-way exclusive builds, eg debug/release/profile. Exclusive builds can also be combined, eg static/shared + debug/release by making two calls to the function. We also handle individual targets of combined exclusive builds, eg static/shared + debug/release, meaning it is possible to run 'make debug' to build both static-debug and shared-debug. Task-number: QTBUG-491 Change-Id: I02841dbbd065ac07d413dfb45cfcfe4c013674ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * xcode: Set QMAKE_XCODE_LIBRARY_SUFFIX from default_postTor Arne Vestbø2013-10-252-2/+3
| | | | | | | | | | | | | | | | | | Otherwise we won't pick up CONFIG+= changes on the command line or from the project file. Change-Id: I6f7e9380f971e6271de5659534e9565024fe041d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * support cleanly querying private modules in qtHaveModule()Oswald Buddenhagen2013-10-251-1/+1
| | | | | | | | | | | | | | | | module names use dashes, but the internal module representation uses underscores, so we must translate. Change-Id: Ib6983d3731e7dae2a4d6232f8a5202390fd425e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * iOS (OSX): rework how to bundle QML import foldersRichard Moe Gustavsen2013-10-251-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, we would copy "$QTDIR/qml" directly into the bundle as "qml". This would cause problems if the user also tried to deploy qml files to a "qml" folder, or if any other file in the bundle ended up with the name "qml" (which is the case for QtDeclarative/tools/qml, where the executable is called "qml"). This patch will instead copy the contents of each import folder into QMAKE_QML_BUNDLE_PATH, which will default to "qt_qml" on iOS and "Resources/qt_qml" on OSX. We also change the implementation to use a post script rather then QMAKE_BUNDLE_DATA for two reasons: 1. Xcode does not like "copy build phases" to copy folders, only files (You cannot even create such a phase from Xcode, although it is possible to force it the way we create project.pbx. But this was error prone) 2. We need to strip away unneeded files from the bundle, like archives (which are linked in statically, not dlopened run-time). Using rsync lets us copy and strip in one operation. Change-Id: I7c2117f6cfbe11efdc272dff71adb0b1e619a5ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * win32-msvc2013: force synchronous writes to .pdb filesJoerg Bornemann2013-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize .pdb file writing, otherwise parallel builds will fail, when different compiler instances try to access the same .pdb file. See also http://msdn.microsoft.com/en-us/library/vstudio/dn502518.aspx Change-Id: I4998f10458d320fd98d633eded02d90bf25ed884 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * make better use of $$MODULE_PLUGIN_TYPESOswald Buddenhagen2013-10-242-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the module project files declare what plugins they need, as that is necessary for automatic android deployment. enable wider usage of this by making the information available from the module .pri files. caveat: the variable is called "types", but is in fact paths, so there can be particular plugins named. use this new facility to replace the egregious hard-coded list of plugin-to-module mappings from create_cmake. possible todo: automate populating DEPLOYMENT (for wince, and whatever else). Change-Id: Ibb9c07cfe2b0008905204cbeb81e9c8e2ae4dc69 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * rewrite handling of private modulesOswald Buddenhagen2013-10-246-123/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of being magic attributes of the main modules, the privates are now proper modules of their own. this cleans up some code paths, is more mappable to other build tools, and enables private modules to depend on other private modules. note that the library path is needed even in the "empty" private modules, as in the framework case that's where headers are found. consequently, the modules need to be explicitly marked with the new "no_link" flag. this required some reorganization of qtAddModule(). Change-Id: I8e4f44a609f8d639cc01bcb658256870a627eb63 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * CMake: Ensure that the EXECUTABLE_COMPILE_FLAGS list existsStephen Kelly2013-10-241-3/+3
| | | | | | | | | | | | | | This is needed to ensure that list(REMOVE_DUPLICATES) can work. Change-Id: I3d992aa244fcdfbda7e3b48ce416e0ba5ffcde96 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Set PRIVATE includes variable to empty, not undefined.Stephen Kelly2013-10-241-5/+5
| | | | | | | | | | | | | | This is necessary so that list(REMOVE_DUPLICATES) works properly. Change-Id: Id268637d76b1a8785c9ff0c6e09e9ad8a62bbfb6 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * qmake: Expose qmake arguments as QMAKE_ARGSTor Arne Vestbø2013-10-241-1/+5
| | | | | | | | | | | | | | | | Allows project files or mkspecs to call qmake recursively using system() with the right arguments, which we use to fix the ios default_post.prf. Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * purge auto_use_privates module optionOswald Buddenhagen2013-10-242-5/+4
| | | | | | | | | | | | | | | | it was introduced as a hack to simplify writing tests, but the change to make use of it was backed out of testlib and nobody seems to care. Change-Id: Icc86621b865276e86593afdb923247bbdca19d49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | QNX: Make use of _readdir64_rBernd Weimer2013-11-252-0/+14
| | | | | | | | | | | | | | | | | | | | | | Latest QNX versions support _readdir64_r. It will be used by QFileSystemIterator now, when available to support large file systems. Change-Id: I40135f405ad72e1ba85c6a4cd282144dd8171bc6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Make console a no-op for WinRTMaurice Kalinowski2013-11-143-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to other platforms there is no concept of a console application in WinRT. Hence all applications need to be UI applications and use winmain. Furthermore winmain takes care of launch arguments to be properly converted to arguments passed to user's main(). There is a chicken and egg problem with config.tests as compilation needs to have an existing entry point which is not available at configure time. Hence hardcode the entry point to main for configuring to WinRT. Those tests are pure compile tests, so the logic of the test does not change. Change-Id: I4d3186691a8440845c24b2529cc9646e86dfd8da Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | WinRT: Remove Windows metadata flags from common mkspecAndrew Knight2013-11-041-2/+2
| | | | | | | | | | | | | | Winmd is not used, so there is no reason to embed it. Change-Id: I0820256aecd9c3c71b0b0c8afa53941b03f97363 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Clean up common winrt/winphone mkspecOliver Wolff2013-10-251-2/+1
| | | | | | | | | | Change-Id: I010bf977e01fab2f39184bbe730ec70128cc2982 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | qmake: Support MSVC2013 for WinRT buildsAndrew Knight2013-10-258-0/+24
| | | | | | | | | | | | Change-Id: I1c102f0b029616997d72933a90c0f9a2a3a9e222 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | WinRT: Added msvc2013 mkspecsOliver Wolff2013-10-2512-2/+183
| | | | | | | | | | | | | | Change-Id: I052f6ba19056e7c0df6d7ea5548eb4dac4db125e Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-2436-271/+406
|\| | | | | | | Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
| * Rename BlackBerry arm mkspecs to be aligned with NDK structureWolfgang Bremer2013-10-238-29/+123
| | | | | | | | | | | | | | | | | | | | | | The current NDK uses CPUVARDIR variable to define whether x86 or armle-v7 is used. Therefore, the whole structure uses these two definitions to separate simulator and device builds. Renaming blackberry-armv7le-qcc to blackberry-armle-v7-qcc allows to directly use CPUVARDIR during Qt5 builds. For compatibility reasons the old folder is kept and includes the new qmake.conf. Change-Id: Ia7feeeabe16eda48140a65178af28cbb9bd085a9 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * de-duplicate QT_MODULESOswald Buddenhagen2013-10-231-0/+1
| | | | | | | | | | Change-Id: I8f1bf08070abb1ba05a4fdb14e7de9e7da5b3ec7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * return()-related break() insanity is not necessary in qt5Oswald Buddenhagen2013-10-231-1/+1
| | | | | | | | | | Change-Id: I593c7160e44d51d25dee76c56c2e5580345ab42a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't suggest to use qtAddModule(), it's internal APIOswald Buddenhagen2013-10-231-1/+1
| | | | | | | | | | | | Change-Id: Idf01d0dd74a0708014b7fca33611535c604a75f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * don't load wayland-scanner for all projects on linuxOswald Buddenhagen2013-10-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | it's wasteful, given that exactly one add-on module (and most probably nobody else) needs it. i'd do the same with yacc and lex, but i suspect this would cause quite an uproar. Change-Id: Ic2a6ca19e829393835f824e31cd0893e78c3fd39 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * iOS: default_post: let xcodebuild_distclean depend on xcodebuild_cleanRichard Moe Gustavsen2013-10-211-0/+1
| | | | | | | | | | | | | | | | | | Otherwise, make would upon distclean first remove the xcode project, then try to do xcodebuild distclean. xcodebuild would then complain about a missing project. Change-Id: I0a9a6af6d86d1a95e37f4bbafa38c63d892bf1cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * remove broken validation of QMLIMPORTSCANNEROswald Buddenhagen2013-10-181-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | the variable may contain a complex command, so an exists() check is doomed to failure if the tool is built dynamically. also, the check is not really necessary: it failing indicates a bug in the qt build system, and we don't really need to complicate the code to deal with such corner cases. Change-Id: I2e6087dcc6dd4a4f70bdf739550276f364c880dd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * make it possible to explicitly suppress the qml import scanOswald Buddenhagen2013-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | if the user knows that no additional imports need to be linked, this can be used to optimize the build time. as it happens, it can also be used to fix the build of the qml tools themselves ... Change-Id: Id77aea1f20cabdc2e831540c61d8a4b8e85c040b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Android: Remove support for QMAKE_SUPPORTED_ORIENTATIONSEskil Abrahamsen Blomfeldt2013-10-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This was created for the iOS port and intended to be cross-platform, but since then they got cold feet and never added the support. It makes no sense to only support this on Android. We need to remove it again and hold off until we can find a proper solution. Editing the AndroidManifest.xml is the non-cross-platform solution for this. Task-number: QTBUG-34166 Change-Id: I51d53b82a3412a9016de01612dd8df9ae12c6633 Reviewed-by: BogDan Vatra <bogdan@kde.org>
| * iOS: Don't hard-code simulator and device architecturesTor Arne Vestbø2013-10-182-2/+5
| | | | | | | | | | Change-Id: Id5a370248b553b7393ec1b187bd34c0ab9f28496 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * iOS: Add default QT_ARCH for configure tests to our own qt_config.prfTor Arne Vestbø2013-10-182-10/+12
| | | | | | | | | | | | | | | | | | | | | | Setting QT_ARCH when empty is a workaround for a missing qconfig.pri, since it hasn't been written yet by configure. As qconfig.pri is loaded by the generic qt_config.prf, putting our workaround in our own wrapper for qt_config makes sense, as it keeps the logic close to where the original QT_ARCH is resolved. Change-Id: I49ffc21cf5dea5ca5b6254ca8084a4dcdc359a72 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * iOS: Prevent stray non-expected rules/targets in Xcode-wrapper makefileTor Arne Vestbø2013-10-181-1/+4
| | | | | | | | | | | | Change-Id: Ibef10ba174df25aa97fd986b51a62d6b7feb119e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * iOS: Wrap user's main by renaming symbol and relying on weak linkingTor Arne Vestbø2013-10-171-51/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This approach is similar to the earlier apprach of defining main=qt_main when building the user's sources, but uses the linker to rename the symbol instead, which is less fragile than using the preprocessor. To keep the hybrid usecase unaffected by our wrapper logic we declare both our main wrapper and a fallback qt_main as weak symbols, which ensures that when the user's application links in our plugin the real main/qt_main provided by the user is preferred over our weak symbols. Change-Id: Ic76f3ba8932430c4b13a1d3a40b8ed2322fe5eea Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Static builds: Link QML plugins.Morten Johan Sørvig2013-10-171-0/+86
| | | | | | | | | | | | | | | | | | Run qmlimportscanner, add found plugins to the LIBS line, generate qml_plugin_import.cpp. Change-Id: I6c6b927cceb36fa2dc405ad698f26d20398b33c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * linux-rasp-pi: Remove custom cursor codeAndy Nichols2013-10-171-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code was added as an optimization for showing a mouse cursor on the Raspberry Pi. What happens though is while the mouse cursor does move more smoothly, the actual application becomes less smooth when the mouse cursor is moved. By removing the custom cursor code, performance will no longer be effected by rendering a moving mouse cursor. Change-Id: I9f8ac6c236cd4ff6d8e1d999a461c3e6db75d7e3 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Add support for disabling exceptions with ICCThiago Macieira2013-10-171-0/+1
| | | | | | | | | | | | Change-Id: Id1ea1bda14a20e44af1eb9f53bae877a3b9fd2e4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Xcode: Dynamically choose release/debug libs based on current configurationTor Arne Vestbø2013-10-162-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-framework builds would automatically link to whatever Qt library matched the config at the time of running qmake, eg hard-coded to libQtCore_debug, while Xcode itself allowed the user to switch between release and debug configurations. We now append an Xcode settings variable to the library path, which gets resolved at build time depending on the current config in Xcode. Change-Id: I12873e38a28d9595ef3fd0ae0ad849e6744833a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * use pkg-config supplied CFLAGS when building with EGLOswald Buddenhagen2013-10-161-0/+2
| | | | | | | | | | | | | | | | | | e.g., -DEGL_API_FB=1 is required for freescale's gpu-viv-bin-imx6 fb driver. Initial-patch-by: Fatih Aşıcı <fatih.asici@gmail.com> Change-Id: I8c8cd60591605e0bc33fcf9de3bfb6ea0d86a570 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Use the cmakeTargetPaths function to process multiple paths.Stephen Kelly2013-10-161-4/+3
| | | | | | | | | | | | Change-Id: I2e874af4f5bf22a3028b7099c39436c400136386 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Output prefix for tools on x86Eskil Abrahamsen Blomfeldt2013-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | When building for x86, the prefix for the tools is not equal to the prefix for the toolchain directory, so we need a separate option for this. Task-number: QTBUG-34110 Change-Id: Iefe8c37892eb6c31fc8762bfb7bc7c6c23cd8b1e Reviewed-by: BogDan Vatra <bogdan@kde.org>
| * Generate source includes in a separate file, if needed.Stephen Kelly2013-10-163-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | The source includes shouldn't be used by installations, so don't install the extra file, but only use it if the package is used from the build-dir. Task-number: QTBUG-33970 Change-Id: I08f91b8a716e935cb04d1233d44cf5c092e240ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Don't test DLLDESTDIR when calculating dll location.Stephen Kelly2013-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | The DLLDESTDIR is not related to the install location and is not populated for prefix_build configurations. That resulted in the CMake files attempting to find the dlls in the lib/ directory instead of the bin/ directory. Change-Id: Iec6a7c9b6dd656278b70ab128f3df9e8c45bbe4a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Clean up support library linkage on AndroidSimon Hausmann2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The explicitly linked support libraries like gnustl_shared, etc. can be linked as private libs, there's no need for them to show up in the .prl files of our libraries. * Removed the explicit linkage against libsupc++, which is a static library whos symbols are also available in libgnustl_shared. It is only needed when linking against gnustl_static, which we fortunately don't do. For QtQml on Android this is more than just cleanup. Without the first change, the libgnustl_shared comes early on in the link line, because it is a dependency of for example Qt5Network. Anything that qml.pro itself adds to LIBS comes afterwards. That is not intended, we want libgnustl_shared to come at the end of the link line, in order to make sure that the linker finds an overriding symbol from another library earlier in the link line first. The explicit linkage against libsupc++ affects the same, as that's the library that contains the symbol we want to override locally (__cxa_end_cleanup). (needed for QTBUG-33892) Change-Id: Id6dff733d6610ae8b15aa72f9cf60ae2c7834194 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
| * iOS: Remove check for unknown Xcode versionsTor Arne Vestbø2013-10-141-3/+0
| | | | | | | | | | | | | | | | We assume new Xcode versions and toolchains won't break anything, just like for toolchains on other platforms. Change-Id: Idb723dbcdbc82e85db1c55b19cd5fe863ca90933 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * iOS: Move qmake features out of the generic features and into the makespecTor Arne Vestbø2013-10-143-0/+0
| | | | | | | | | | | | | | As they are closely tied to the macx-ios-clang mkspec and can't be shared. Change-Id: Icb59304cc1e4be12732f50175f3f84be289300c2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * macx-xcode: Change wrapper to write to QMAKESPEC to change mkspecTor Arne Vestbø2013-10-142-8/+7
| | | | | | | | | | | | | | | | | | The allows us to remove the custom logic in default_post for finding the plist files, and also fixes issues when the wrapped mkspec had its own feature files. Change-Id: I4c26cf6a7809f527e170c51c57f59aaf6088774c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * make sure that installed meta files are always postprocessedOswald Buddenhagen2013-10-111-0/+1
| | | | | | | | | | | | | | | | | | | | the problem is that there is no sed command on windows ... so build it into qmake and invoke that from the generated makefiles. cmake does the same, after all. ^^ Task-number: QTBUG-33794 Change-Id: Ib7077e18acbc5edd79f714c5779a5ed31ea6c093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 17:06:47 +0000