summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-269-45/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c
| * Use /Zc:throwingNew by default with MSVC 2015Thiago Macieira2015-08-101-1/+1
| | | | | | | | | | | | | | | | | | As recommended by MS in http://blogs.msdn.com/b/vcblog/archive/2015/08/06/new-in-vs-2015-zc-throwingnew.aspx Change-Id: Id3d5c7bf4d4c45069621ffff13f80cecc1141353 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * WinRT: Link against correct c-runtimeMaurice Kalinowski2015-08-074-30/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to move adding ucrt(d).lib out of the various qmake.conf as qmake.conf is only parsed once by qmake and does not differentiate between debug and release. Hence use default_pre.prf which is the earliest prf to use. This one also is being parsed multiple times and does what it is supposed to do. This allows API certification tests for Win10 to suceed, another sideeffect is that it is much cleaner at a single location now. Change-Id: Id899f4bbd063a3191c8f139857abf90efa827ffc Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * WinRT: Add Architecture flag to manifestMaurice Kalinowski2015-08-061-1/+2
| | | | | | | | | | | | | | | | The architecture needs to be specified to be properly used inside Visual Studio and for winrtrunner to parse dependencies. Change-Id: I218100f33efcba9f78199cbd1e48089269648e61 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * WinRT: Fix build for Windows 10Maurice Kalinowski2015-08-063-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | bf24838c3344f009f9fe40f596a4eab798f071b3 introduced a hard dependency on kernel32.lib, which needs to be added for the msvc2015 mkspecs. As the library differs for Windows Phone / Windows 10 Mobile, this most likely has the side-effect that we will need to introduce winphone-xxx- msvc2015 at a later stage. Change-Id: I8fa2a68d421345c14ba90efc6faa5eea1ad457e1 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * WinRT: Add dependency support for Win10Maurice Kalinowski2015-08-064-7/+12
| | | | | | | | | | | | | | | | | | | | So far the dependency keyword has been ignored for the new Windows 10 mkspecs. The difference to older manifest files is that there is already a <Dependency> section and hence we embed dependencies inside this one, as the format standard does not allow to have multiple of those. Change-Id: I1bf25979cc28d5c153215de5bb9cd6f37e9c50aa Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * WinRT: Add manifest and assets to install rulesMaurice Kalinowski2015-08-061-0/+8
| | | | | | | | | | | | | | | | | | This enables to create fully functional packages from the output of 'nmake install'. Change-Id: Ief83532cdfc4575f7c42f5bb6a3cee4c9f0ecbd3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | mkspecs: add option to enable boot2qt platformSamuli Piippo2015-08-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add configure time option to enable boot2qt platform using DISTRO_OPTS. On embedded, the QtWebEngine is supported only on boot2qt platforms. To have QtWebEngine CI tested on embedded, we need a way to to enable boot2qt platform for existing mkspecs. Change-Id: I218da5b8071041ca1c95eb218b2d552fcc9980d2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | QNativeSocketEngine: add code to receive IP header dataThiago Macieira2015-08-221-0/+1
| | | | | | | | | | | | | | Change-Id: Iee8cbc07c4434ce9b560ffff13ca466263abcb1b Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | Add Intel NUC device makespecLaszlo Agocs2015-08-182-0/+54
| | | | | | | | | | Change-Id: I2ffaadd06f27da8ec8f44d7d698e84e1fe780270 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devTimur Pocheptsov2015-08-092-14/+14
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-062-14/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
| | * MSVC2015: Disable warning C4577 ('noexcept' used with no exception handling ↵Friedemann Kleint2015-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode specified). Fix the flood of warnings: src/corelib/global/qflags.h(52): warning C4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc now occurring since we don't have exception handling enabled. Change-Id: I05d12ee6303b4f9fceb48507fadfd7d1a5604ea4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * iOS: ensure we don't overwrite a projects qmake variablesRichard Moe Gustavsen2015-07-281-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider a project that does the following: launch_images.files = $$PWD/LaunchImage.xib QMAKE_BUNDLE_DATA += launch_images In that case we end up overwriting launch_images.files in default_post, and at the same time, add launch_images a second time to QMAKE_BUNDLE_DATA. The result will be that we copy our own launch image twize into the bundle. To prevent this, prepend our internal variables with qmake_ Change-Id: I24f870874017b5388248e3bfadecd461422ffe35 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | Require more of the C++11 Standard LibraryThiago Macieira2015-08-062-11/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since libstdc++ builds on OS X and QNX 6.5 are no longer supported, simply require <initializer_list> and std::move in order to claim C++11 support works. The minimum OS X versions need to be fixed elsewhere. Change-Id: Ib056b47dde3341ef9a52ffff13ef1d2ac3923f5c Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | iOS: Refactor xcodebuild exclusive build logic into standalone makefileTor Arne Vestbø2015-08-044-67/+177
| | | | | | | | | | | | | | | | | | | | | | Instead of going to qmake to generate the makefile that we want, we write the makefile directly and include it from the generated makefile. This leaves us with a single top level makefile for handling exclusive builds through xcodebuild, and covers all the various build configurations in a unified manner. It also allows for improved test device handling. Change-Id: I66851f181ac4da2c8938645e0aa95ffa0fee33c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | iOS: Refactor default_post logic into more appropriate unitsTor Arne Vestbø2015-08-045-170/+190
| | | | | | | | | | | | | | | | | | The logic was lumped together in one big file. Now that things are more stable and the logic has proven to work over time we can split it out into the more appropriate sub-prfs. Change-Id: I9a40ad72ad9d7550b609e7f50fade1049dfa3ac1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Update/fix the qmake support for (f)lexThiago Macieira2015-07-311-6/+15
| | | | | | | | | | | | | | | | | | | | lex.prf was trying to be halfway between the standard POSIX lex requirements and those of GNU flex. So fix it to work with both, more or less, by noticing when lex is actually flex and using the extended GNU options. Note that POSIX lex is untested and may still not work. Change-Id: Ib306f8f647014b399b87ffff13f1e8e43fb68b3c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | winrt: Fix build when INADDR_XXX macros are not definedAndrew Knight2015-07-221-0/+10
| | | | | | | | | | | | | | | | These macros are not defined unless a desktop or standalone SDK is installed. Change-Id: I4c600ddca5944cc5fde310e4fbe0866a7250d36b Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Update/fix the qmake support for yaccThiago Macieira2015-07-201-6/+6
| | | | | | | | | | | | | | | | | | yacc.prf was mostly working, so this commit simply makes it slightly better by using the -p and -b options that POSIX requires and avoid having a common intermediate file. Change-Id: Ib306f8f647014b399b87ffff13f1e8e74ad4db1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Makes sure that yacc works with the MSYS bison on Windows.Thiago Macieira2015-07-206-6/+6
| | | | | | | | | | | | | | | | | | | | Most people's yacc are actually a symlink to bison. On Windows, where symlinks don't usually exist, we can use bison -y. This was tested with MSYS Bison. Change-Id: I913745d48af30f9ef7b846b6438500261dd6022d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Make CONFIG += c++11 by default not disable GNU extensionsThiago Macieira2015-07-179-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer -std=gnu++11 unless strict_c++11 is defined. You can enable strict C++11/C++14 mode by using CONFIG += strict_c++ That is enabled for Qt's own code, so we we don't accidentally use GNU extensions in portable code. There's no support for strict C++98 mode (that is, the -ansi option). [ChangeLog][qmake] By default, GNU extensions are now enabled with Clang, GCC and ICC even in C++11 and C++14 modes. To disable the GNU extensions, add to your .pro file: CONFIG += strict_c++. Change-Id: Ib056b47dde3341ef9a52ffff13ef14de2169bef5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into HEADSimon Hausmann2015-07-174-5/+87
|\| | | | | | | | | | | | | Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe
| * Update the list of compilers we are free of warnings withThiago Macieira2015-07-171-4/+4
| | | | | | | | | | | | | | | | | | I've tested with GCC 5, Clang 3.5 and 3.6 on Linux. Change-Id: Ia0aac2f09e9245339951ffff13c87198f2e8aa35 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix separate_debug_info with unversioned_libnameAllan Sandfeld Jensen2015-07-081-1/+1
| | | | | | | | | | | | | | | | Handle unversioned_libname like plugins. Task-number: QTBUG-47065 Change-Id: I98469589416beb13f5beeff7273e84417fdbbfd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Added Mkspec for Toradex WEC2013 SDKBjoern Breitmeyer2015-07-062-0/+82
| | | | | | | | | | Change-Id: I738c422ba5f1c1293ce54f53548af62458dda22b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-07-017-15/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
| * iOS: remove unrecognized compiler flag '-fno-arc-abi'Richard Moe Gustavsen2015-06-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | Clang does not recognize the compiler flag 'no-arc-abi' anymore. This causes a warning, which will fail the build. Not sure what the flag does, as I cannot find any documentation for it, even after grep-ing through the sources (both clang-600.0.57 and clang-503.0.38) Change-Id: I39fae3fd108a8edb978f4264935a069cce4c302a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-271-9/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4
| | * Use absolute rpath to Qt libraries for non-prefix buildsTor Arne Vestbø2015-06-041-9/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-46391 Change-Id: Iaebba29c340fb027e23a0923f3692d47f9d450d5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| * | Disable gold linker/new dtags support for host buildsPeter Seiderer2015-06-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no test for gold linker and new dtags support for the host build (only for the target compiler/build) which leads to trouble in some cross compiling environments (see [1] for details). So disable gold linker/new dtags support unconditionally for host builds. [1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html Task-number: QTBUG-46125 Change-Id: Ic62828704dcce461487d63860705158cce3e4af8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | embed a VERSIONINFO resource into QML pluginsJoerg Bornemann2015-06-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, we set VERSION for QML plugins, because this embeds a VERSIONINFO resource into the DLL that can be inspected by the user. Change-Id: Ifb42efed6ceee05d05f61a271e028776cac6a3a2 Task-number: QTBUG-46473 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | fix usage of wince scopeOswald Buddenhagen2015-06-053-3/+3
| |/ | | | | | | | | | | | | Fix style issues along the way. Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | iOS: Use LC_MAIN to wrap user main() instead of mangling object filesTor Arne Vestbø2015-06-293-107/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With iOS 6.0 and above the LC_MAIN load command is available, which allows dyld to call the application entrypoint directly instead of going through _start in crt.o. By passing -e to the linker we can change this entrypoint to our wrapper that sets up the separate stack before entering the native iOS runloop through UIApplicationMain. As before, we call the user's main() from applicationDidFinishLaunching. By using LC_MAIN instead of messing with the object files we open up the possibility of generating Bitcode instead of object code, which can be useful for link-time optimizations, either locally or by Apple. Change-Id: If2153bc919581cd93dfa10fb6ff1c305b3e39a52 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* | Modernize Beagleboard/Beaglebone specsLaszlo Agocs2015-06-291-3/+4
| | | | | | | | | | | | | | | | | | Use hard float. This has already been the case for the commercial Beaglebone reference images, it's time to fix the old specs too. Change-Id: Ic9007285f64a3055fb637e7eacead17cbad1cad4 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* | fix "install target not created" for WinRt buildsJoerg Bornemann2015-06-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3ce99adf replaced DEPLOYMENT with INSTALLS and introduced the "install target not created" warning when running qmake on WinRt projects. The code path in qt.prf that was responsible for filling the DEPLOYMENT variable was never functional in Qt5. We're turning the code path off until this is properly fixed. Change-Id: If836ef648f9fb601b7597d39e3d00665d4cf01b0 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Remove exec bits from files that should not be executableDmitry Shachnev2015-06-071-0/+0
| | | | | | | | | | | | | | Change-Id: I66f49c6db82eadc3b11cc9b1cf01375e9596a8e6 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devSimon Hausmann2015-06-0424-32/+293
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-0324-32/+293
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| | * Merge 5.5 into 5.5.0Oswald Buddenhagen2015-06-0110-3/+266
| | |\ | | | | | | | | | | | | Change-Id: I27921a25a0fc56afb5429e40fc1e9b4b9a645a9a
| | | * Run license checker in qmakeKai Koehne2015-05-271-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for a valid license not only in configure, but also in qmake. To limit the runtime overhead we cache the day of the last run in a .stash file. This allows us to run licheck only for the top-level qmake call, and only once per day. This requires an updated licheck executable that supports the new check mode. [ChangeLog][Tools][qmake] For commercial builds, qmake now checks for a valid Qt license. This requires setting up a Qt Account (or .qt-license file) on the development machine. Change-Id: I2c2a05a4602cc661560568b76ddf520cb8134769 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * WinRT: Add qmake support for Windows 10Maurice Kalinowski2015-05-267-0/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows creation of applications for - x86 - x64 - arm While the arm build theoretically also allows to launch on a mobile, it currently asserts on runtime. Either we will create a new mkspec for Windows 10 Mobile in the future, or do runtime checks for the environment. That also depends on whether there will be a separate SDK by Microsoft. Change-Id: I510bfc88410a5b5a1eb7c37f7f43888d1e5dda0d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| | | * remove vestiges of .private_dependsOswald Buddenhagen2015-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | amends 16f4bc5b6. Change-Id: I5a9acb2fb57e92a152656be196e55c830031988e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | | * Fixed compilation of auto tests using vc(x)proj filesOliver Wolff2015-05-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the defines looked like -DQT_TESTCASE_BUILDDIR=""C:\..."" compilation from Visual Studio (vcxproj) failed due to the two quotation marks at the beginning/end of the actual path. So for the vc(x)proj we do not use shell_quote but add the quotes manually. Change-Id: I186258d82a56928cd0316bff1ec9f60147044165 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | fix installing unix dll symlinks on windows hostsOswald Buddenhagen2015-06-011-3/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by implementing a fake ln in qmake. symlinks are supported only since vista (we officially still support xp), and even there are permission-restricted (MS being (rightfully) afraid of symlink attacks). so we fake the links by copying the files instead. the previous hack was a bit naive, simply using cp/copy instead of ln. this didn't work with relative paths, as real symlinks are resolved against their parent directory, not the working directory of the "ln" command. the new fake does this correctly. Change-Id: Ia2f5d68a39d6ffcc8a4383f9d0fc63a9da0a05c3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * allow modules to declare that they have generated private includesOswald Buddenhagen2015-05-201-2/+9
| | | | | | | | | | | | | | | Change-Id: Ifbd561aab9c6a6634930b525aa1d51b9ad792a09 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| | * WinRT: Disable exceptions when turned offMaurice Kalinowski2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On desktop windows we define _HAS_EXCEPTIONS=0 to also forward this option. Hence harmonize this with WinRT builds as well. As a side-effect qtdeclarative now compiles without warnings on WinRT. Change-Id: I8e343f172160991ffb2ede01303802f321de82b5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| | * Let MSVC treat warnings as errorsKai Koehne2015-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat warnings printed by MSVC 2012, 2013 as errors in the modules that declare themselves warning_clean (for developer builds). Change-Id: I55fb3bde460e13cfdbd6f59634e3b5335b2dd715 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Purge default locations from commonly used device makespecsLaszlo Agocs2015-05-133-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including /usr/include and lib can cause cryptic failures if there is already a Qt installed to /usr. Having standard locations listed should not be necessary at all. Change-Id: I08a15a064cc1aec126733f7e1962a2fa2ec38fcb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| | * Build Qt for OS X and iOS with relative rpath.Adam Strzelecki2015-05-132-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defaulting to absolute_library_soname on configure -rpath is no longer necessary as now we support @rpath install name ids on OS X and iOS. This also sets QMAKE_SONAME_PREFIX to @rpath for Qt modules when built with rpath configuration. This makes Qt libraries relocatable on OS X. Qt SDK is not yet relocatable though, because plugin locations (including cocoa plugin) are still resolved using absolute path (see QTBUG-14150). Also, there are several absolute paths hardcoded in qmake mkspecs pri files. Task-number: QTBUG-31814 Change-Id: I36b9384cd69ac609608acbe2b3d5e0512317e0d6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 02:30:46 +0000