summaryrefslogtreecommitdiffstats
path: root/mkspecs/macx-xcode
Commit message (Collapse)AuthorAgeFilesLines
* Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Rename gcc-base-macx.conf to gcc-base-mac.conf and use it for iOS as wellTor Arne Vestbø2013-03-051-1/+1
| | | | | | | | | | The only difference between the two is that iOS append @executable_path/ to QMAKE_LFLAGS_SONAME, but since shared libraries are not supported on iOS anyways, this is not really something we have to care about. Change-Id: I4797a4dfb94d9b3af03af22618351b98b48f8255 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Rename common/mac.conf to common/macx.confTor Arne Vestbø2013-03-051-1/+1
| | | | | | | | | | | | This is a step towards making mac a shared scope for both Mac OS X and iOS, while macx is Mac OS X specific and ios is iOS specific. We'll then move iOS to not include macx.conf, once we make the change to not have iOS imply macx. Change-Id: Ic9ce4d597873aa3cf2c981598354733e07db644d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Use sdk.prf to set macosx-version-min instead of static conf filesTor Arne Vestbø2013-02-221-1/+2
| | | | | | | | | | | | | Allows us to dynamically generate the command line option for iOS later, and allows the user to override QMAKE_MACOSX_DEPLOYMENT_TARGET with the expected effect on the command line options. We unset PERL5LIB to ensure we get the system Perl libraries, since the Mac OS 10.6 CI machine seems to have a broken XML::Parser::Expat from macports/CPAN. Change-Id: I04430c7b1daf9452d72f9a04a6b7f8d0d6926884 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Mac: Set minimum version to 10.7 for clang-libc++Morten Johan Sorvig2012-10-241-0/+1
| | | | | | | | | | | | Clang's libc++ does not support 10.6. Add mac-minimum-version.conf which sets the version to 10.6. Set the version to 10.7 in the clang-libx++* mkspecs. Change-Id: I494d0d24b0d73d9395e9d5406c8c63c9af87f8cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Enable HiDPI mode for retina displays.Morten Sorvig2012-10-231-0/+2
| | | | | Change-Id: I3b62ec9c3bf5e53c6ec056b95c52cfeb6ce5b61f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-221-25/+25
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* centralize initialization of CONFIG in mkspecsOswald Buddenhagen2012-09-081-1/+1
| | | | | | | | "CONFIG += qt warn_on release link_prl" is in every single spec (though for link_prl there is one genuine exception and two apparent omissions). Change-Id: I72e1e315586af828eefa3b0b70998ab892ec3c1a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* centralize initialization of QT in specsOswald Buddenhagen2012-09-081-1/+0
| | | | | | | | there is no reason whatsoever to duplicate this so many times, and even less reason to have specs with a deviating default. Change-Id: Ia25836c079580adebc373697b8bd03598f79c69b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove useless TEMPLATE assignments from specsOswald Buddenhagen2012-09-081-1/+0
| | | | | | | "app" is the built-in default anyway Change-Id: I4f581ee5b81aee08860dbdda5d863943bceafb1b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix indentation.Morten Sorvig2012-09-041-1/+1
| | | | | Change-Id: I0e53df9e1903c8cdc79d50c16cfe7f90ae6e1d6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove all usages of "arch" CFLAGS on Mac.Morten Johan Sorvig2012-05-041-4/+0
| | | | | | | | | | | | | Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS and OBJECTIVE_CFLAGS. Delete the arch prf files. 32/64 bit arch selection will be made using a different mechanism in Qt 5. Universal builds are not supported. Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add support for XCode 4 into qmakeAndy Shaw2012-03-011-2/+0
| | | | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> (cherry picked from commit b5871311457ca97816c0abbb8b935570bbfb657c) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | 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: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-231-1/+1
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove execute permission from files that don't need it.Jason McDonald2012-01-101-0/+0
| | | | | Change-Id: Ib92875289cdd9831f35301c566fb567acc725bb6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-241-18/+18
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Initial import from the monolithic Qt.Qt by Nokia2011-04-274-0/+113
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 16:28:01 +0000