summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * change approach to requesting headers-only modulesOswald Buddenhagen2015-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | there is no need to make exceptions for install targets now, so instead of abusing qt_no_install_library, introduce a new header_module flag. Change-Id: I4ad7e301d1b60938b17e1dea732b1dbe3ff88a1a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Merge remote-tracking branch 'origin/5.4' into merge5.5Allan Sandfeld Jensen2015-05-083-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3
| | | * Require -fPIC instead of just -fPIE for -reduce-relocationsThiago Macieira2015-05-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 5 combined with a recent binutils have a new optimization that allows them to generate copy relocations even in -fPIE code. Clang has the same functionality when compiling an executable with -flto. We need to let the compilers know that they cannot use copy relocations, so they need to use really position-independent code. Position independent code throughout is not really required. We just need the compilers to use position-independent access to symbols coming from the Qt libraries, but there's currently no other way of doing that. Task-number: QTBUG-45755 Change-Id: I0d4913955e3745b69672ffff13db5df7377398c5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | rpath: use new DTAGS if availableOswald Buddenhagen2015-05-052-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows LD_LIBRARY_PATH to take precedence over the hard-coded rpath, which is the only sane thing to do (which is also why i'm not adding an option to disable it). this behavior is consistent with non-linux systems. the windows version has no auto-detection, just like for gold linker usage. Task-number: QTBUG-3069 Change-Id: Ief9ba032291c898d75d76ecc740390954382a804 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | remove now superfluous eval callsJoerg Bornemann2015-06-031-2/+2
|/ / / | | | | | | | | | | | | Change-Id: I743f1ec35101aad0ab71cf10932d144a1b04f7e6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | deprecate DEPLOYMENT variableJoerg Bornemann2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the qmake variable DEPLOYMENT that was used for installing files on remote devices for Windows RT and Windows CE Visual Studio projects. Use INSTALLS for both nmake and Visual Studio projects. [ChangeLog][core][qmake] Deprecated the qmake variable DEPLOYMENT in favor of INSTALLS. Task-number: QTBUG-21854 Change-Id: Ia9d2c69feb7d87b0b9dc69ff7c0a68be35a57acd Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Ensure that CONFIG += plugin_bundle will create Mach-O bundles on OSX/iOSTor Arne Vestbø2015-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The makespec inits QMAKE_LFLAGS_PLUGIN to the same as QMAKE_LFLAGS_SHLIB, which will create a dynamic library by passing -dynamiclib. The advantage of creating a proper bundle (MH_BUNDLE) instead of a dynamic library (MH_DYLIB) is that bundles can be unloaded completely by the host application. Change-Id: I03b39b704c09213f40a4cb84f5794bf6b3669fc0 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | Allow RESOURCES to contain standalone files and collections of filesTor Arne Vestbø2015-05-181-0/+60
|/ / | | | | | | | | | | | | | | | | | | | | Standalone files are added by using RESOURCES += file.txt, while collections of files are defined as collection.files = f1.txt f2.txt and then added using RESOURCES += collection. For collections a prefix can also be set using collection.prefix = /foo. The standalone files are not prefixed. Change-Id: I8236808238414da05e744f799a1bb15a72f4a46f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Move QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO definition to gcc-base.confRomain Pokrzywka2015-04-303-6/+3
| | | | | | | | | | | | | | | | | | | | The flags are the same across all GCC flavors so put the definition in the common gcc-base.conf instead of duplicating it in g++-base.conf and clang.conf Change-Id: I1ba2c3c314d3a02b559c384aecef74240f69f659 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | make headers-only modules work for framework buildsOswald Buddenhagen2015-04-272-4/+11
| | | | | | | | | | | | Change-Id: I00125883335c5b8cc556b4e4c964e11c55aa989b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | cmake: Don't mark header-only frameworks with the FRAMEWORK property.Stephen Kelly2015-04-271-0/+2
| | | | | | | | | | | | | | | | | | CMake INTERFACE targets may only have whitelisted properties, and FRAMEWORK is not in the whitelist in released CMake versions. Change-Id: I27cd0cfbe1b52f25c91bf1b3c0d55879bed91bdf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Stephen Kelly <steveire@gmail.com>
* | fix distclean targetsOswald Buddenhagen2015-04-232-0/+25
| | | | | | | | | | | | | | | | | | | | this makes the distclean targets work throughout qt. the dreaded confclean target is aliased to distclean. Task-number: QTBUG-8202 Task-number: QTBUG-20566 Change-Id: I7ac8e3b5b0110825dc93e4fa885281db91c6cf83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | support headers-only modulesOswald Buddenhagen2015-04-231-3/+8
| | | | | | | | | | | | | | automatically set TEMPLATE=aux if qt_no_install_library is set. Change-Id: Iccceda468da762b181fdd5c8e511bf6ed19af599 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | don't overengineer DESTDIR calculationOswald Buddenhagen2015-04-232-8/+10
| | | | | | | | | | | | | | | | just like in qt_plugin.prf, the DESTDIR setting is actually fixed per module type. Change-Id: I5837b5884699f0d50e4067733af8aacbab93bc42 Reviewed-by: Stephen Kelly <ske@ableton.com>
* | cmake: Don't populate legacy variables for header-only modules.Stephen Kelly2015-04-231-0/+2
| | | | | | | | | | | | | | As these are a new type, there is no legacy code to support. Change-Id: Ie5abd353563d68d0449a07e06065f34db805f710 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | don't try to include non-existing private module .priOswald Buddenhagen2015-04-211-2/+5
| | | | | | | | | | | | | | amends b8f79e7095d1. Change-Id: If4358634a66947d7644224466b239e470d15afda Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | disable automatic PCH compilation for headers-only modulesOswald Buddenhagen2015-04-211-1/+1
| | | | | | | | | | | | | | | | there is neither a point in building a PCH that will never be used, nor does it even work with the aux TEMPLATE. Change-Id: I2fe11f951f81adf5e15066ed60f983003c76b451 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | make QMAKE_CXX/CROSS_COMPILE verification work under windowsOswald Buddenhagen2015-04-212-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically append the .exe extension. this is done unconditionally, which means that providing it in the spec is wrong by definition. don't use system("which") (which won't do what we want in a windows shell), but scan PATH ourselves. as a bonus, this is also faster. to avoid fetching and splitting the path multiple times, factor out a function in spec_pre.prf. Change-Id: I95f0fa285c158b347d45422111f91540e3a595fd Reviewed-by: Jochen Seemann <seemann.jochen@gmail.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Implement a more direct headersclean checkThiago Macieira2015-04-173-5/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test each include file directly, instead of doing a large #include. This verifies that each header is compilable on its own. One big advantage of doing it via a special compiler in qmake is that we skip pre-compiled headers, which has hidden build errors in the past. This solution is implemented by making syncqt produce a second list of headers. This list is the same as the list of headers in the source code to be installed, minus the headers that declare themselves to be unclean, via the pragma: #pragma qt_sync_skip_header_check This mechanism is applied only for public libraries (skipping QtPlatformSupport, an internal_module). This test is enabled only for -developer-builds of Qt because it increases the compilation time. On QtTest: the library only links to QtCore, but it has two headers that provide inline-only functionality by including QtGui and QtWidgets headers (namely, qtest_gui.h and qtest_widget.h). If those two modules aren't getting compiled due to -no-gui or -no-widgets to configure, we need to remove the respective headers from the list of headers to be checked. If they are being built, then we need to make QtTest's build wait for the headers to be generated and that happens when qmake is first run inside the src/gui and src/widgets directories. Change-Id: I57d64bd697a92367c8464c073a42e4d142a9a15f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Liang Qi2015-04-151-0/+14
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-151-0/+14
| |\| | | | | | | | | | Change-Id: I004854a25ebbf12b1fda88900162fe7878716c58
| | * fix dependencies for generated headers from TYPELIBSJoerg Bornemann2015-04-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependencies to all header files generated by dumpcpp are now added to every object file. This fixes parallel builds of projects that use TYPELIBS. Change-Id: I3c0456c7b182a42296ec6999aa86d1293ffd2e42 Task-number: QTBUG-45118 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | cmake: Generate INTERFACE targets for include-only modules.Stephen Kelly2015-04-153-6/+66
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require CMake 3.0 if an attempt is made to use a cmake file containing an INTERFACE library. If the user is using a CMake version older than 3.0, then exclude INTERFACE libraries from dependencies of Qt modules. The Qt CI system is running CMake versions as old as 2.8.11, which makes that the current minimum version. The only header-only module existing so far is the QtUiPlugin module, which has been split out from the QtDesigner module. If using CMake 2.8, the forwarding headers in the QtDesigner module will be used, and the effect of the split out library will not be seen. If using CMake 3.0, the split out library is listed as a dependency and its transitive usage requirements such as the QT_UIPLUGIN_LIB definition are made available. Change-Id: Iecee3bbc440842dca27dc067f2a31e3526efa01b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Remove the old headersclean unit testThiago Macieira2015-04-102-94/+0
| | | | | | | | | | | | | | We have configure -headersclean now Change-Id: Iaf576b16d7c756a08ec5c3dfa32deaa343e5e029 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Upgrade ANGLE to 2.1~99f075dade7cAndrew Knight2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aligns with Chromium branch 2356. This version brings more complete OpenGL ES 3 support as well as various bug fixes and performance improvements. The following changes were made to earlier patches: -0000-General-fixes-for-ANGLE-2.1 Removed. All changes are now handled elsewhere. +0001-ANGLE-Improve-Windows-Phone-support Consolidated remaining parts from 0009/0010. +0002-ANGLE-Fix-compilation-with-MinGW Remaining issues from patch 0016. +0003-ANGLE-Fix-compilation-with-MSVC2010 Remaining issues from patch 0015. +0004-ANGLE-Dynamically-load-D3D-compiler-from-list Renamed from patch 0008. +0005-ANGLE-Add-support-for-querying-platform-device Renamed from patch 0013. -0004-Make-it-possible-to-link-ANGLE-statically-for-single Removed. Fixed by adding defines to project files. -0008-ANGLE-Dynamically-load-D3D-compiler-from-a-list-or-t Renamed to patch 0005. -0009-ANGLE-Support-WinRT Removed. Mostly fixed upstream; remaining parts in patch 0001. -0010-ANGLE-Enable-D3D11-for-feature-level-9-cards Removed. Mostly fixed upstream; remaining parts in patch 0001. -0012-ANGLE-fix-semantic-index-lookup Removed. Fixed upstream. -0013-ANGLE-Add-support-for-querying-platform-device Renamed to patch 0005. -0014-Let-ANGLE-use-multithreaded-devices-if-necessary Removed. No longer needed. -0015-ANGLE-Fix-angle-d3d11-on-MSVC2010 Moved remaining parts to patch 0003. -0016-ANGLE-Fix-compilation-with-MinGW-D3D11 Moved remaining parts to patch 0002. -0017-ANGLE-Fix-compilation-with-D3D9 Removed. Fixed upstream. -0018-ANGLE-Fix-releasing-textures-after-we-kill-D3D11 Removed. Fixed upstream. -0019-ANGLE-Fix-handling-of-shader-source-with-fixed-lengt Removed. Fixed upstream. -0020-ANGLE-Do-not-use-std-strlen Removed. Fixed upstream. -0020-ANGLE-Fix-compilation-with-MSVC2013-Update4 Removed. Fixed upstream. [ChangeLog][Third-party libraries] ANGLE was updated to Chromium branch 2356 (2.1~99f075dade7c). Change-Id: I32ccbfe95e10986bd94be7191dfd53445ea09158 Task-number: QTBUG-44815 Task-number: QTBUG-37660 Task-number: QTBUG-44694 Task-number: QTBUG-42443 Reviewed-by: Andrew Knight <qt@panimo.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | qmake: Rework dll deploymentOliver Wolff2015-04-071-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | QT_INSTALL_LIBS is not the right place to check for Qt dlls, as they cannot be found there in a non-developer build. In order to be able to find the dlls and make adding dll locations easier for the user, QMAKE_DLLS_PATHS was added. On Windows, the variable points to Qt's bin directory by default. Task-number: QTBUG-44960 Change-Id: Ie4e5beeaadee798a055599387e842d7c0502c27a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix clang release with debuginfo buildsAllan Sandfeld Jensen2015-04-011-0/+2
| | | | | | | | | | | | | | | | The variables used for release with debuginfo was set in g++-base.conf which is not included by clang builds. Change-Id: Iec3b23c371c113ff934d2c7f5134ef78b1cf939e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-03-3113-17/+23
|\| | | | | | | | | | | | | | | | | Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
| * Android: Fix compilation on armv5 with 4.9 toolchainEskil Abrahamsen Blomfeldt2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | Thumb instructions trigger a compiler bug in e.g. Qt Script when used with armv5 in the recent versions of the toolchain. We already disabled this for the 4.8 toolchain, but the bug is also present in 4.9, so we need to disable it there as well. Change-Id: I6cadc7efd2b59b9a2ffec038559edd0e7782a4b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * restore qt4's qtLibraryTarget() behaviorOswald Buddenhagen2015-03-055-9/+15
| | | | | | | | | | | | | | | | | | | | the function is used in our examples and code generated by qt-creator, so the qt5-specific magic behavior is inappropriate. create a separate function instead. Task-number: QTBUG-44595 Change-Id: I4d72cc1e5cbfc274b3210520baa213f4c5479ca9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Adjust wiki links to the new redirectSergio Ahumada2015-03-047-7/+7
| | | | | | | | | | | | | | it looks nicer this way Change-Id: I872976bdef5f581187a758aa92b02e2f5f32b130 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | testlib: Don't limit linking to XCTest to Xcode projectsTor Arne Vestbø2015-03-301-1/+1
| | | | | | | | | | | | | | | | Applications built using the regular makefile generator also need to link to XCTest, as the library is referenced from qxctestlogger.mm Change-Id: Iedbb5c6a2811fd904d75abc20f4e39440e44e748 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | fix C4275 warnings for MSVC 2010 buildDebao Zhang2015-03-281-1/+2
| | | | | | | | | | | | | | | | | | | | This issue had been fixed by SHA: a12a2fdf684a6fc19aefc14f32842deab0270e86 but re-introduced by SHA: c23d1c76953704ecb52c833d7ef1de2e2f89b1e6 again. Task-number: QTBUG-45085 Change-Id: If98ee108335d80035179a83b1b28f384395d8373 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Add XCTest logger backend to QtTestLibTor Arne Vestbø2015-03-273-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will be active when running test apps through Xcode's 'test' action, and reports QtTestLib test objects and functions to Xcode as XCTest cases. This allows running tests on both iOS Simulator and iOS devices from the command line, through xcodebuild, without relying on any 3rd party tools. It also integrates Qt test failures and passes into the Xcode IDE, which may be useful for closer investigation of test failures. The feature is limited to Xcode 6.x. Change-Id: I33d39edbabdbaebef48d2d0eb7e08a1ffb72c397 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | fix quoting problems in ios main() renamerOswald Buddenhagen2015-03-272-8/+11
| | | | | | | | | | | | Task-number: QTBUG-45125 Change-Id: I6fc724509e25a43bb229715f7e486bf9c3553f53 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | provide a way to disable only the axserver registrationOswald Buddenhagen2015-03-271-1/+2
| | | | | | | | | | | | | | | | ... without disabling the idc/idl compilation. Change-Id: I600c9461ece8ad85e763b9eea83345bfe1de825f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 13:03:28 +0000