summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Only run tests for the default exclusive builds targetTor Arne Vestbø2015-03-121-16/+9
| | | | | | | | | We now have support for more complex exclusive builds configurations, e.g., on iOS with simulator and device configurations, so we can't hard code the logic for choosing the right exclusive build to test. Change-Id: I358687b297b7bf1eb28eef0ef0aaf44b89860404 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* qmake winrt package_manifest: Abort when uuidgen is not foundAndrew Knight2015-03-121-1/+3
| | | | | | | | | | | It's pretty easy to forget to run qmake from a vcvars prompt. Doing so causes the UUID to get persistently written as empty, breaking the vc project. Change-Id: I5badb31ad4f606abbe8c71979019e097c748e07a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Peng Wu <peng.wu@intopalo.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Windows: Add -static-runtime configure optionKai Koehne2015-03-111-0/+7
| | | | | | | | | | | | | Support statically linking the MSVC/mingw runtime libraries without manually tweaking mkspecs. This is helpful for projects like the installer framework. MSVC does not support mixing MT[d]/MD[d] flags in different compilation units. The static_runtime option is therefore added to both QT_CONFIG and CONFIG. Change-Id: Ifd6dc9c362090457de8e2c62477d0445f9479722 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* QNX: enable Neon support to be compiled in for QNXSamuli Piippo2015-03-092-1/+1
| | | | | | | | | | Neon detection in configure does not work unless correct flags are passed to compiler. Task-number: QTBUG-44690 Change-Id: If119cc9ed80275aaa8796c1be8853559a7670d6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* iOS: Auto-detect available devices when running make check for testingTor Arne Vestbø2015-03-091-1/+17
| | | | | Change-Id: I447d8faf421c31de68dde64211b795eaccec17a4 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* iOS: Use Xcode project to filter out environment variables instead of shellTor Arne Vestbø2015-03-091-1/+2
| | | | | | | | | Xcode has a setting for script phases to filter out the environment variables, so we don't need to use grep. Change-Id: Ica1c64321385ab3e3b47cf6f8f4d4191bd963540 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* iOS: Enable runnnig Qt tests using 'make check' via xcodebuild testTor Arne Vestbø2015-03-071-9/+7
| | | | | | Change-Id: I1692cf3eb34726c15eaa969a369bb97a89773bfd Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Xcode: Make QMAKE_MAC_SDK_(PLATFORM_)PATH depend on active SDKTor Arne Vestbø2015-03-071-0/+18
| | | | | | | | | | | | | The Xcode project generator doesn't support exclusive builds, and always runs as the default debug/release config, and with iPhoneOS as the target platform. This means we need to parameterize the QMAKE_MAC_SDK_* build settings to depend on the currently active SDK in Xcode, so that the paths, when used in eg. linker flags, are up to date. Change-Id: I9ca10f794e14ab440d98820657758b3fd8a7cdb0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* iOS: Resolve QT depends before checking if we need to link in platform pluginTor Arne Vestbø2015-03-071-1/+2
| | | | | | | The logic failed for cases like QT += core widgets. Change-Id: Ic49c1a2314a4698b03956acbd6778b658326f3e2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* centralize setup of shell-related variables in spec_post.prfOswald Buddenhagen2015-03-0621-93/+64
| | | | | | | | | | | | | | | | | | it makes no sense to let every spec do that separately, as it's fixed by the generator+shell. putting it into a file which is loaded regardless of the spec also allows us to remove the hardcoded fallbacks from qmake. if somebody overrode the values in their spec for some weird reasons, they'll need to override spec_post.prf. shell-{unix,win32}.conf are now dummies and print warnings. Task-number: QTBUG-37269 Change-Id: I66c24fb4072ce4d63fdbfc57618daa2a48fa1d80 Reviewed-by: Jochen Seemann <seemann.jochen@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Xcode: Generate scheme manually, instead of letting Xcode do itTor Arne Vestbø2015-03-063-0/+106
| | | | | | | | | | | A scheme is required to be able to run tests through Xcode, even from the command line, but Xcode doesn't auto-generate the schemes until launched as an application. Xcode also auto-generates schemes for all our targets, but we only need one for the primary application target. Change-Id: Ia42f3825aba3ffde3be93be55e165d6284434853 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* qmake: Expose iOS/OS X SDK platform path as QMAKE_MAC_SDK_PLATFORM_PATHTor Arne Vestbø2015-03-061-0/+8
| | | | | | Change-Id: I2e58c22301a433208718c26b362b4dda2b891f0e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* iOS: Resolve correct SDK as part of sdk.prf instead of default_post.prfTor Arne Vestbø2015-03-062-10/+12
| | | | | | | | | | The latter location resulted in the wrong SDK paths being resolved if sdk.prf was loaded before default_post.prf through an explicit load(sdk) call. Change-Id: Ia443260572fbdf5f9ed1daf558c2962703274e32 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Xcode: Add support for generating XCTest test bundles out of Qt testcasesTor Arne Vestbø2015-03-061-0/+6
| | | | | | | | | If the user adds CONFIG+=bundle and doesn't set QMAKE_BUNDLE_EXTENSION, we interpret that as a request to generate a test bundle. Change-Id: Id4fbb64d39cddd6f95ac641a910a9d5543c30daa Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* eglfs: Pluginize RPi, iMX6 and Mali backendsLaszlo Agocs2015-03-057-372/+10
| | | | | | | | | | | | | | eglfs does not depend on the device makespecs anymore when it comes to these device integration backends (hooks). Instead, backends are autodetected by configure. The name of the preferred plugin is still set in the device makespecs. This is optional. When not set and there is more than one plugin present in the system, the environment variable QT_QPA_EGLFS_INTEGRATION will have to be set at runtime. In the absence of that, the order is undefined. Change-Id: Ie1ced2c9aa1beff2adb13b4fdea7c499cb5a6aab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add Raspberry Pi 2 specsLaszlo Agocs2015-03-052-0/+60
| | | | | | Change-Id: Ifc99af49398e5d6e057035d2de55fe218c8418d6 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Add __APPLE_CC_ to QMAKE_COMPILER_DEFINES for moc.prfTor Arne Vestbø2015-03-041-1/+1
| | | | | | | | | Moc doesn't have the built in defines that clang has, so we need to hard-code some of these so that moc resolves the Q_OS_IOS define in the end, based on qsystemdetection.h and TargetConditionals.h Change-Id: Id9a7f870b940f99f27c55a2a887d0ce93217b821 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix leaking ISA extensions in LTCG buildsAllan Sandfeld Jensen2015-03-043-0/+5
| | | | | | | | | | | | | Due to common subexpression elimination instruction set extensions may leak from the objects where they were enabled when doing link-time optimizations. To avoid that this patch disables LTCG/LTO on files built with extra instruction set extensions. Change-Id: Ie34ad900be7fb04a0dc4d3562187ee170c183333 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-03-027-7/+7
|\ | | | | | | Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
| * Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-02-277-7/+7
| | | | | | | | | | Change-Id: If6c05a5b1f60e97c64f3d6b64041a84c3af82964 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Add mfloat-abi to linker flags for ARM devicesSamuli Piippo2015-02-272-0/+3
| | | | | | | | | | | | | | | | | | | | | | Cross compilers from latest yocto (dizzy) are no longer built with default value for mfloat-abi, which means it needs to be given for both compiler and linker to produce correct binaries. Otherwise linker will selected dynamic linker as /lib/ld-linux.so.3, instead of /lib/ld-linux-armhf.so.3 when compiling for hard-float. Change-Id: I2fe116b1a90a0fbd078a4e8757abd4bc64a7b56e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Fix VS build for target path with spacesOswald Buddenhagen2015-02-261-2/+2
| | | | | | | | | | | | | | | | VS expects references to $(TargetPath) to be quoted by the user. Task-number: QTBUG-25030 Change-Id: Ib5a07730836a42533d5488882e877074ccceea4c Reviewed-by: Prasanth Ullattil <prasanth.u@gmail.com>
* | Remove BlackBerry PlayBook support.Rafael Roquetto2015-02-204-84/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: - the PlayBook NDK is old and its compiler does not keep up with newest C++11 improvements inside Qt code. - the PlayBook NDK diverges considerably from the standard BB10 NDK, making it non-trivial to keep a common codebase. - It's a defunct platform. - Maintenance time is limited. [ChangeLog][Platform Specific Changes] Removed BlackBerry PlayBook support. Change-Id: Ia338aff55f4e4b747ebdecb0e1463a369a656c03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Fixed license headersJani Heikkinen2015-02-172-2/+2
| | | | | | | | | | Change-Id: Ibebe1318d1c2de97601aa07269705c87737083ee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | support spaces in build and install dirsOswald Buddenhagen2015-02-174-21/+28
| | | | | | | | | | | | | | | | spaces in the source dir are not supported for now, as that requires some more profound refactoring of the bootstrap makefiles. Change-Id: Ie0c07a1558b8326f642f2ea144bc1cd85ee761af Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | MSVC: Remove use of -Zm argumentKai Koehne2015-02-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been setting the -Zm argument since the dawn of times (even before the first git commit). Anyhow, MSDN from VS2008 onwards indicates that this is not needed: "In earlier versions of Visual C++, the compiler used several discrete heaps, and each had a finite limit. Currently, the compiler dynamically grows the heaps as necessary up to a total heap size limit, and requires a fixed-size buffer only to construct precompiled headers. Consequently, the /Zm compiler option is rarely necessary." [ChangeLog][Compiler Specific Changes] Visual Studio: -Zm200 (an option to specify the precompiled header memory allocation limit) is not added anymore by qmake to the compiler calls. If you encounter an C1076 compiler error you might need to re-add it in your .pro file. Change-Id: Ia4bec7eba09d893a7d81886a1814602b9ce7563c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Configure MSVC builds as C++11Allan Sandfeld Jensen2015-02-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | QtWebEngine and QtWebKit uses the Qt config to detect if C++11 is enabled. Since it is always enabled on MSVC, we can safely set the flag indicating it is a C++11 build when using a newer MSVC version. Change-Id: I2efb8d1a9b1cf1496481569403c00358d0cae365 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix up the imx6 mkspecsLaszlo Agocs2015-02-121-12/+2
| | | | | | | | | | | | | | | | | | | | The comments at the top are simply out of date. With modern toolchains -no-gcc-sysroot causes only trouble. Similarly, enable hardfloat by default. Change-Id: I80a1319ae26a6e0a8af71e07fbc43478a2b905ef Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* | fix fallback for xcode specsOswald Buddenhagen2015-02-121-0/+1
| | | | | | | | | | | | | | clearly, it's not very useful if nobody noticed it yet. anyway ... Change-Id: Ieef1593e42031f8c17a3d7e9e67e3194ded9c066 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | remove branches for no longer supported build toolsOswald Buddenhagen2015-02-121-3/+0
| | | | | | | | | | Change-Id: Ib40ed85b02afb7db8bfef7c6dacfba57b1ba4fe3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | make use of qtAddToolEnv() in pkgConfigExecutable()Oswald Buddenhagen2015-02-121-9/+5
| | | | | | | | | | Change-Id: I60e86ac869f670258c82520072836cdfff3b2dc2 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Update copyright headersJani Heikkinen2015-02-11130-927/+911
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-103-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro src/gui/image/qimage_conversions.cpp src/gui/opengl/qopenglextensions_p.h src/gui/text/qtextengine.cpp src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/eglfs/qeglfshooks_stub.cpp src/plugins/platforms/eglfs/qeglfsscreen.cpp src/plugins/platforms/eglfs/qeglfswindow.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp src/plugins/platforms/windows/qwindowsnativeinterface.cpp src/plugins/platforms/windows/qwindowsscreen.cpp src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/windows/qwindowswindow.h src/plugins/platforms/xcb/qxcbdrag.h src/widgets/itemviews/qabstractitemview.cpp src/widgets/kernel/qwidget.cpp src/widgets/util/qsystemtrayicon_p.h tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp conflicts. Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
| * fix env variable setup on unix for testcases when DESTDIR is setOswald Buddenhagen2015-02-031-3/+4
| | | | | | | | | | | | | | | | | | prepend the 'cd' command only after prepending the variables, as otherwise they'd apply to the cd command only. Task-number: QTBUG-44183 Change-Id: Ibf96a16ce2c9cd9c0e80ca3cd5433e64ec19b136 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * Overwrite QMAKE_DEFAULT_XXXDIRS values.BogDan Vatra2015-02-031-0/+3
| | | | | | | | | | | | | | | | | | If we set ANDROID_NDK_PLATFORM env variable, QMAKE_DEFAULT_XXXDIRS still contains old ANDROID_PLATFORM, so we need to overwrite it. Change-Id: I917e24caa11bd589966b3fb11be3a9f3c4370b3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * CMake: Fix QObject::connect failing on ARMAlbert Astals Cid2015-02-031-2/+0
| | | | | | | | | | | | | | | | We need PIE, doesn't matter if reduce_relocations is used or not Change-Id: I9a359b9d4443a6059980cd4c48058132ec4267fe Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Remove unused function from rpi hooksLaszlo Agocs2015-02-051-33/+0
| | | | | | | | | | | | | | | | This is a leftover from the old experimental mouse cursor support which got removed. Avoid compiler warnings by removing this function too. Change-Id: Id269ff987883708d1061a315fef70b8fc6f13706 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* | introduce /dev variants of qmake propertiesOswald Buddenhagen2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | these reflect the on-target paths (unlike /raw, which are host paths, just without the -sysroot). this is necessary for anything deployment-related, starting with RPATH. Change-Id: I13d598995d0e4d6cb0dc1fc7938b8631cf3e3a95 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | make the installed meta files play nicely with sysrootsOswald Buddenhagen2015-02-052-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkg-config .pc files use the raw target paths (and pkg-config patches up -I and -L flags on the fly), so these files were actually already fine. libtool .la files use the magic prefix = to denote the sysroot. this works only with libtool 2.4+ (sept 2010). qmake .prl files have no built-in sysrootification magic, but as they are read by qmake, it's possible to put property references into them. this makes them relocatable, both inside and outside sysroots. Change-Id: I97236ac81e7aba4e4771d14a44cbf59144cc2d3e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | add value quoting to qtAddToolEnv()Oswald Buddenhagen2015-02-041-1/+2
| | | | | | | | | | | | | | | | | | for sh, this is usual quoting. for cmd, this means escaping closing parens - everything else is permitted anyway. Change-Id: I1179849d95f1f1f9e4b0d62ecd88917a1327f60f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | nuke gbuild generatorOswald Buddenhagen2015-02-022-251/+0
| | | | | | | | | | | | | | | | | | it never left the rudimentary stage. should it ever be re-added, it needs to be done basically from scratch anyway. Change-Id: I76858c8a2c90235f228f7a6e5a178a10a2669d37 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devSimon Hausmann2015-01-218-5/+22
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-218-5/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
| | * iOS: add AppIcon asset name to Xcode projectRichard Moe Gustavsen2015-01-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current work-flow for adding app icons to an iOS app during deployment is not good. You basically need to specify that you want to use asset catalogs from within Xcode and add your icons there. The problem is that qmake will regenerate the Xcode project the next time it runs, and your changes will then be lost. This patch will check if the project has a valid asset catalog assigned to QMAKE_BUNDLE_DATA, and configure the Xcode project to use it for app icons. Change-Id: I06621ca46aad91de96cb23ba8ca3b1a3f1226670 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | * iOS: bump QMAKE_IOS_DEPLOYMENT_TARGET to 5.1.1Richard Moe Gustavsen2015-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | AppStore validation requires deployment target to be at least 5.1.1 for 64-bit applications. Change-Id: I4d857ad983e6d4059f541bff523dd63479aca849 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | * use the major qt version for the library stem also in cmake filesOswald Buddenhagen2015-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | amends 7ef2f9f65cc8e35. Change-Id: I1b7a029d8c73f5ce20d216e3b40a7c118eca4891 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Stephen Kelly <steveire@gmail.com>
| | * Remove the -load_all option from the linker enabling static buildsAndy Shaw2015-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the -load_all option turned on then it will cause a problem with the network bearer plugins as they share the same files and on OS X two plugins will be built and potentially linked against when building statically. This only effects gcc builds because clang does not turn this option on when linking by default either. Task-number: QTBUG-39238 Change-Id: Ib259304c3da74b6b4f6fcc6e3766427303af3bbe Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| | * windeployqt: add clean step to toplevel makefileMaurice Kalinowski2015-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently you could only invoke windeployqt for debug and release builds, but not windeployqt_clean resulting in artifacts after the clean step. Change-Id: I3a93e4909a017f3594cc5b0c2249ed25b777c008 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andrew Knight <qt@panimo.net>
| | * Link against QMAKE_LIBS_EXECINFO when using backtrace(3).Raphael Kubo da Costa2015-01-033-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new mkspec variable, QMAKE_LIBS_EXECINFO, for platforms where backtrace(3), backtrace_symbols(3) and others are not in libc, but rather in a separate library -- on the BSDs, this is libexecinfo. Use it in corelib/global/global.pri so that libqt5core links against it and has the proper dependency when necessary. Change-Id: I62ac36c9b3ba7ab0719420cb795087d43ec138a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | WinRT: Disable compiler warning 4996 for debug buildsKai Koehne2015-01-191-1/+1
|/ / | | | | | | | | | | | | | | | | Move compiler warning 4996 from level 3 to 4, like we did already for desktop builds: 0a76b6bc7f98900ea8 . Change-Id: Ic4bbaeb3104352a915b15eec7a9c9dda9a5cceec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 07:11:00 +0000