summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add detection of and support for Visual Studio 2015Joerg Bornemann2015-04-092-0/+139
| | | | | | | | Backport of qtbase/ce1c53b4. Task-number: QTBUG-45100 Change-Id: I10db5cfca9976bc37e86b415c2b6e10f51ec5eeb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAkseli Salovaara2015-03-31183-2424/+2424
| | | | | | | | | 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. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Info.plist.lib whitespace fixupMorten Johan Sørvig2015-03-046-18/+18
| | | | | Change-Id: I2fed6342004218f4173c0ef72130b710d1a0f0c8 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* QNX: Fix QDir::entryInfoList()Bernd Weimer2014-04-222-2/+2
| | | | | | | | | | | | | | If D_FLAG_FILTER is set, duplicate name entries are filtered out, so this flag has to be set along with D_FLAG_STAT in the call to dircntl. Also releaved dependencies between defines__EXT_QNX__READDIR_R, __EXT_QNX__READDIR64_R and _POSIX_THREAD_SAFE_FUNCTIONS Back-ported from qtbase: aee59f06e0017e225363d4207d3d96c2b30698e1 Change-Id: Ifa2148cc49544076fcfe8fb88e2a0dfe2404959e Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Updated year in copyright headerKai Koehne2014-03-26177-177/+177
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* win32-msvc2013: force synchronous writes to .pdb filesJoerg Bornemann2014-01-231-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 Task-number: QTBUG-36398 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 59ae8323b7a57cc04d19fc1f552aeaeda9dad3f7) Change-Id: I7263b875a1015724bae6c37fb540d52507a1c7da Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* add support for Visual Studio 2013Joerg Bornemann2014-01-212-0/+139
| | | | | | | | | | | | | | | Add mkspec win32-msvc2013 and make VS 2013 known to configure and qmake. Task-number: QTBUG-36135 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit f1cdd4b2976706c6d9c3166a75afff6ec5856f3d) Change-Id: I6a6d1ce0de0ba85e1b711976c7340893c58e29ae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Enable building with clang / libc++ on OS X 10.9 MavericksBrian Jensen2013-12-054-0/+164
| | | | | | | | | | | | A minimalistic change to enable building with clang / libc++ on OS X 10.9 Mavericks. The configure script now avoids overriding build settings when using clang/libc++. Added a new build configuration with settings specific to clang/libc++ on OS X. Task-number: QTBUG-34652 Change-Id: Iaedaff7c06e9818a5f2ee0d6db93fbe3b2e65e28 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QNX: Make use of _readdir64_rBernd Weimer2013-11-283-0/+21
| | | | | | | | | | | | Latest QNX versions support _readdir64_r. It will be used by QFileSystemIterator now, when available to support large file systems. Backport from qtbase/5d8c05baf478d8eb8cb7ce827caa2c1103f5fa3f Change-Id: I264cc39a0cae6e84ed0db2e10df5ea22c8ae3df4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Sun CC: Fix QtNetwork compilationSergio Ahumada2013-08-281-1/+1
| | | | | | | | Change QT_SOCKLEN_T from int to socklen_t Change-Id: I3f93230f36c9af1a709e3ff301a63d18e1e02b4e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* gdb_dwarf_index: Use a sed call that's more POSIX-compliant.Raphael Kubo da Costa2013-08-131-1/+1
| | | | | | | | | | | | | | sed versions other than the GNU one often default to being POSIX-compliant, in which case "+" (with and without escaping) is always an ordinary character. Achieve the same functionality in a way that works with both GNU and BSD seds by using "xx*" insted of "x\+". Cherry-picked from qtbase/faea8d1056e4b034404febd0ef44a00e7784018d. Change-Id: I462e070992ff214a7261d45c208f2e5f3e962e8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Don't overwrite QMAKE_QT_CONFIG with empty valueJonathan Liu2013-06-061-1/+5
| | | | | | | | | | | | If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten with an empty value from .qmake.cache. Avoid this by first checking if the value from .qmake.cache is not empty before assigning it to QMAKE_QT_CONFIG. This was already addressed differently in Qt 5. Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Avoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1Konstantin Ritt2013-04-248-8/+8
| | | | | | | based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598 Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake: increase .pro-file compatibility between Qt 4 and 5Marc Mutz2013-04-051-1/+12
| | | | | | | | | | | | | This patch makes qt.prf not warn about libraries in QT that are separate modules in Qt 5, but exist as part of some larger library in Qt 4. With this change, both Qt 4.8 and Qt 5 projects can use QT += widgets concurrent to continue compiling unchanged under either Qt version. Change-Id: I6f7c6a913377d7b44263c8ed152b272aa7ed9aa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* mkspecs: fix the path for rcc for win32-g++Liang Qi2013-03-201-0/+1
| | | | | | | | patch not needed for Qt5 Task-number: QTBUG-27237 Change-Id: I41856f55b71661bfa01c4011129a35e110a234f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-13175-175/+175
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QNX: adjust settings for separate debug info featurePeter Hartmann2012-12-151-3/+10
| | | | | | | | | | | Patch-by: Greg Bentz Task-number: QTBUG-28247 (backport of commit b6250913be2fecedbc61738a47ff147f0a4ea240, Id Ibd1f959969a8678b828c8e8de8be0a200a632b22) Change-Id: I5e5b85fb0fce52ba50a1600bf91212f46b2597c8 Reviewed-by: Greg Bentz <gbentz@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* BlackBerry mkspecs: optimize linker flagsPeter Hartmann2012-12-042-0/+4
| | | | | | | | | | | | | * relro makes some sections read-only before giving control to the program; * now resolves all symbols when the program is started and allows for the GOT being marked read-only to prevent it from being overwritten. These settings have been used internally for device builds already. Change-Id: I03576d4fd1585ad566865e2a7a0341b3e13c3b06 (cherry picked from commit c8c8e1990ce74590739bd52874e38e03e3d64825) Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Device mkspec for Blackberry PlaybookRafael Roquetto2012-11-284-0/+98
| | | | | | | | | This defines Q_OS_BLACKBERRY_TABLET. This define is not necessary on Qt5. Change-Id: I2e2553f3b33d896df9e219c12e738251eed8a231 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* BlackBerry mkspecs: use compiler flags for C++ and C compilerPeter Hartmann2012-11-282-0/+5
| | | | | | | | | | | | | ... and not only for the C compiler. Apparently the logic has changed between Qt 4 and Qt 5. This commit is not needed for Qt 5, because there we set the CXXFLAGS after parsing the BlackBerry mkspec file. Change-Id: I225d636586d19fa0e2b0d5a644071202774a385c Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* BlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)Peter Hartmann2012-11-251-0/+2
| | | | | | | | | | | ... so the compiler knows which instructions to generate and can optimize for the specific CPU. All BlackBerry platforms are Cortex-A9 compatible. (cherry picked from commit 44b1c5dde2dfbb69a29cbd4ad8d1f0ac0203b482) Change-Id: I730dea78421d4688e0afa60f8f095f3166e5b733 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Updated and fixed win32-icc mkspec for ICC 12.1 or betterAlexey Ivanov2012-10-311-16/+18
| | | | | | Change-Id: I50653386b0abcb39bc50ea90b65201922460ee75 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't set QT_BUILD_DIR as a side effectOswald Buddenhagen2012-10-302-7/+10
| | | | | | | | | | | | | we would be setting QT_BUILD_DIR to $$[QT_INSTALL_DATA] as a fallback, which would make qtPrepareTool() believe we were doing a qt build despite actually trying to build something against an installed qt. this would become apparent only when using a non-default directory layout, as is the case in our mac packages. Change-Id: I4f27e9427222ad3b9bb83fcc625bab19e00db9be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove the -falign-stack option from ICC's mkspec.Thiago Macieira2012-10-181-1/+1
| | | | | | | | | | | | | | | | This option was necessary in early ICC 12 releases because of a difference in interpreting the ABI requirements with GCC. According to ICC devs, GCC changed the ABI on its own to require 16-byte-aligned stacks on i386. It looks like this option has been the default in later ICC 12 releases. At least 12.1 update 5 has it by default. ICC 13 does not have the option anymore but accepts it silently for backwards compatibility. (cherry-picked from qt5 change 76874dea4449029856a7a1f639b995a9e35c6166) Change-Id: Id8bb4c250718eef2f02dc97bd47a0efd95b272fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* optimize loading of qconfig.pri & qdevice.pri somewhatOswald Buddenhagen2012-10-172-5/+5
| | | | | | | | | avoid some expensive operations. note that this uses exists() where !isEmpty() would be more intuitive, but isEmpty() does not work on magic variables in qt4. Change-Id: I904463eb1021d208c21fc602af3228350756ed4b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-143-7/+19
| | | | | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Original-patch-by: Greg Bentz (cherry picked from commit 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f) Change-Id: I5867fc03dde1ef6e2fbf3747bdb9aaf15518eb6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNX: change suffix for separate debug filesPeter Hartmann2012-10-021-7/+9
| | | | | | | | | | | QNX uses .sym for files containing debug symbols. Patch-by: Greg Bentz (cherry picked from commit 291e1a9e67499f6fa8285a1d4ed1ea6e8297dd5f) Change-Id: I03202da79de0f606c7c99a2db986d2343e51663d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Enable HiDPI mode for retina displays.Morten Sorvig2012-10-027-0/+14
| | | | | Change-Id: I8eb912a90185f0eceac8cf2918c3971e3472a8c4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-29179-4274/+4274
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-181-1/+1
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Add msvc2012 supportPeter Kümmel2012-09-172-0/+139
| | | | | | | | | | | The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS. It is a documented breaking change: http://msdn.microsoft.com/en-us/library/bb531344.aspx Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* When x-compiling on Linux the host tools doesn't have Windows' executable suffixPeter Kümmel2012-09-121-3/+5
| | | | | | | patch not needed for Qt5 Change-Id: I26a6cd8de91dc6df7d31a9f38187f7b1e8209cc1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* find qdevice.pri even for installed qt buildsOswald Buddenhagen2012-09-101-1/+1
| | | | | Change-Id: Ife18068974227d70c52e7cb0d06e6136827ac562 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Add -pipe option of win32-g++'s QMAKE_CFLAGSYuchen Deng2012-09-101-1/+1
| | | | | | | cherry-picked from qt5/qtbase commit 2b57a8ebfeb6e3495b63fac619631896ca670f11 Change-Id: Idccab648df1a9456a4ee19f1acfdb0544d40a928 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add qmake CROSS_COMPILE variable via load(device_config)Peter Kümmel2012-09-071-7/+13
| | | | | | | | | The compiler prefix could be set optionally by CROSS_COMPILE. Partial cherry pick from qtbase/2dc3181bdcc0d447d2bec42fa3b7cbecb640a51a Change-Id: I9a9cc31d7c5fda8b33fe280ee2a90cda0196da7d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Minimal backport of --device-option support in configurePeter Kümmel2012-09-071-0/+14
| | | | | | | | | | This parial backport only adds the --device-option so it becomes possible to set and cache additional qmake variables. Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676 Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Move qpa-based mkspecs out of the unsupported directorySean Harmer2012-09-058-8/+8
| | | | | | | | | | | | | | RIM is committed to supporting Qt on its platforms and the port works well. Backport of commit 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2 Change-Id: If34940018036685c6b8dbda193c97b8c50eef1dd Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Enable pre-compiled header support for QNXSean Harmer2012-09-041-0/+5
| | | | | | | Backport of bc80ee36f8ffe18f8362b2328ca29f92291df132 Change-Id: I76453dadc24c9bf7ff34d972214c057b82143c77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Decouple -lang-c++ from CXX command on QNX mkspecsSean Harmer2012-09-044-8/+5
| | | | | | | | | | | | | | Making -lang-c++ integral part of the $CXX command was wrong, because there are cases where $CXX must be called without the -lang-c++ file (when building asm files for instance). This commit moves the -lang-c++ to $CXX_FLAGS where it belongs. Backport of commits f4f185edd9dda513320e23b9a3e3f92be203884f e3224554272600a22fd9d22bdb754832b5127da2 Change-Id: I18be06411648281bd42f3c40b8add637cd7ddfa0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix indentation.Morten Sorvig2012-08-247-7/+7
| | | | | Change-Id: I3442592b903afa99e85953cdf40b91b914963a8b Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QNX: Enable QT_NO_IMPORT_QT47_QMLKevin Ottens2012-08-231-0/+2
| | | | | | | | Add this include to reduce the startup time of QML based applications. Supporting the "Qt 4.7" module name isn't needed for QNX. Change-Id: I86db40eefa83ccdd53a036faf0df4fd2135b2b74 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix vcproj file generation for incredibuild handling of moc etc targetsAndy Shaw2012-08-141-1/+2
| | | | | | | | | | | | | | | When incredibuild-xge had been turned on by configure then it was not ensuring that the generated vcproj files had the right extra comments needed to make incredibuild run moc and other tools in parallel. By fixing the prf file to get around a problem in the parser this is now respected. Task-number: QTBUG-14482 Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit fb3c850581953983588d49391f40f03cc7e61e62)
* Update contact information in license headers.Sergio Ahumada2012-08-01160-310/+312
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* [Blackberry] Set default platform name for QPARafael Roquetto2012-07-302-0/+4
| | | | | | | | | | | Set the default platform name/plugin to be 'blackberry' when building for BlackBerry devices. qtbase ref: 5430d1de Change-Id: Id2b3263fd9e1b2214751c3c4d75b8991599926e5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add common build flags required for iOS platform plugins.Ian Dean2012-07-271-1/+1
| | | | | | | Disable QPF & QPF2 fonts and dummy (QWS) input methods. Change-Id: I020f8e9f7e240a7bc4d31a008513e2289bb46f18 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed existing iOS mkspecs. Added Qt5 iOS mkspecs to unsupported.Ian Dean2012-07-2541-317/+1322
| | | | | Change-Id: I504d987abd092d25c68f7209cb5787a01d6fac50 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Clang: Do not warn about unused parameters (caused by ccache)Tobias Hunger2012-06-281-0/+2
| | | | | Change-Id: If4e16b17d999cebac5579e108e9a2dbb7df20d2d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compile issue on AIXAndy Shaw2012-06-241-1/+1
| | | | | | | | | | Since local thread storage is used we need to turn this on for the xlc compiler with the -qtls flag. Change-Id: Ib40ec87edada56a062b0c72b7d47b38a6d0b5b13 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ef459193ec927f347a2c91b180994428c6ea1a97)
* Enable extra warnings for win32-g++ mkspecsJonathan Liu2012-05-242-2/+2
| | | | | | | Change-Id: Ia3a5c2ca35b9da466f0cfab054a8b69a941797fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from commit 10cfb08eae9ce60ad6895d6a75e857d2591ca4dd)
* mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | | | | Commit ae2060dc56501ab387863757c3fd90d5cfed7dd2 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Cherry-picked from f42a61e76ac209db0bfeefdb03de22ce26b422bf to qt5/qtbase. Change-Id: I005bab3bc79ca3a0dc1b2d3a70d058b77c304f46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2024-11-22 10:23:09 (GMT)