diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 15:46:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 18:40:12 +0100 |
| commit | d28f454a677d3f0a168b80aadfc97a20aeaa70ea (patch) | |
| tree | 1a0b5bcb9fcd6d4e42e13bb6fd8b594ab5339623 /mkspecs/common/gcc-base.conf | |
| parent | 26b260c0c18a50080ac75081b60671e4b1f04438 (diff) | |
Rename gcc-base-macx.conf to gcc-base-mac.conf and use it for iOS as well
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>
Diffstat (limited to 'mkspecs/common/gcc-base.conf')
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 43ebc0ab3a..2676cd6f04 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -7,8 +7,7 @@ # # Platform-specific options shared by these compilers are put into: # -# - gcc-base-ios.conf -# - gcc-base-macx.conf +# - gcc-base-mac.conf # - gcc-base-unix.conf # # These base files are then combined with configurations for each compiler: @@ -20,7 +19,7 @@ # - clang.conf # # The combination happens in the top level mkspec, by including a platform- -# specific version of the base-file, for example gcc-base-macx.conf, and then +# specific version of the base-file, for example gcc-base-mac.conf, and then # a (possibly platform-specific) version of the actual compiler configuration, # for example g++-macx.conf. # |