summaryrefslogtreecommitdiffstats
path: root/mkspecs/macx-llvm/qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Don't use scopes in mkspecs as configure does not support themTor Arne Vestbø2010-11-021-1/+1
| | | | | | | | | Configure has very basic parsing of mkspecs where it traverses includes, but assumes that the last seen value is the right one. Since this parsing does not take scopes into account we can't use tricks like isEmpty(). Reviewed-by: ossi
* mkspecs: Emit warning when including g++.conf directlyTor Arne Vestbø2010-10-271-1/+1
| | | | | | | | | | | | 86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people with their own mkspec who would still include g++.conf directly. We now print a warning if this situation is detected, and explain to the user how they can fix their mkspec. For convenience we redirect g++.conf to g++-unix.conf so that people's mkspecs will still work. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* mkspecs: Refactor precompiled-header configuration out of gcc-base(-mac)Tor Arne Vestbø2010-10-181-0/+5
| | | | | | Preparation for introducing Clang-style precompiled-header support. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Refactor GCC mkspecs to share more configuration optionsTor Arne Vestbø2010-10-131-1/+3
| | | | | | | | | | | | | | | | | The g++ and llvm mkspecs now share the common parts in common/gcc-base.conf Each top level mkspec includes a platform-specific version of this base, either common/gcc-base-unix.conf or common/gcc-base-mac.conf, and these platform specific bases will include the cross-platform one. The same pattern is then used for the g++ specific configurations, which are split up into common/g++.conf, common/g++-unix.conf and common/g++-mac.conf The qplatformdefs.h for mac was also shared where possible. The test in tests/manual/mkspecs was used to ensure that the final output of all the mkspecs was the same after the refactoring as before. Reviewed-by: ossi
* add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIXOswald Buddenhagen2010-02-261-0/+1
| | | | | | | | | | the unix makefile generator can make files for "regular" unixes and macos (the difference being the framework handling). so far, the output choice was hard-wired to the host platform. the previous commit made that soft-configurable, and this one exploits this capability to enable limited cross-building. Reviewed-by: mariusSO
* Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-231-2/+0
| | | | | | | | | | | The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+19