AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0872b62b2e
qt5base-lts/mkspecs/macx-g++-32/qmake.conf

24 lines
532 B
Plaintext
Raw Normal View History

Add mkspecs for 32-bit Mac OS X builds. Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-05-03 10:42:16 +00:00
#macx-g++ (different from g++.conf)
#
# qmake configuration for macx-g++
#
Refer to Apple products by their actual names. This is a comment-only change. Change-Id: I2432b1135ef21d781c9486df06699710f2696ee3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-07-09 14:07:07 +00:00
# OS X + command-line compiler
Add mkspecs for 32-bit Mac OS X builds. Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-05-03 10:42:16 +00:00
#
Fix '=' alignment and replace tabs in *.conf (whitespace only change) Replace all tabs with proper space characters and consistently align the '=' characters. The default alignment for the '=' of 25 characters has been left as is to get a minimal diff. Lines with the '=' further to the right and those belonging to 'proper code (TM)' have not been touched. The work was mostly done using the following python script (might come in handy again...): import sys, re indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)') for fn in sys.argv[1:]: with open(fn, 'r+') as f: lines = [] nl_count = 0 continuity_indent = None for l in f: m = p.match(l) nl = l if m: n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1)) if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0: n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4 n_spaces = max(1, n_spaces) # we want at least one space before '='/'+=' nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n' continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$' elif continuity_indent: nl = ' '*continuity_indent + l.lstrip() if l[-2] != '\\': # check when to stop the continuation continuity_indent = None elif l.startswith('#'): nl = l.expandtabs(2) if l != nl: nl_count += 1 lines.append(nl) if nl_count > 0: print fn, nl_count, len(lines) f.seek(0) f.writelines(lines) f.truncate() Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-19 01:57:31 +00:00
MAKEFILE_GENERATOR = UNIX
purge vestige: plugin_no_soname is no more ... for a loooong time. it was replaced by plugin_with_soname (which is unused so far). Change-Id: Ifc377d155d6eac41e85f3a0914ed817d55b5648b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-21 16:20:51 +00:00
CONFIG += app_bundle incremental global_init_link_order lib_version_first
Add mkspecs for 32-bit Mac OS X builds. Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-05-03 10:42:16 +00:00
QMAKE_INCREMENTAL_STYLE = sublib
Rename common/mac.conf to common/macx.conf 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>
2013-03-02 14:13:38 +00:00
include(../common/macx.conf)
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>
2013-03-02 14:46:37 +00:00
include(../common/gcc-base-mac.conf)
Add mkspecs for 32-bit Mac OS X builds. Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-05-03 10:42:16 +00:00
include(../common/g++-macx.conf)
Use sdk.prf to set macosx-version-min instead of static conf files 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>
2013-02-15 16:27:51 +00:00
Bump the minimum supported OS X and iOS versions As per mailing list discussion: http://lists.qt-project.org/pipermail/development/2016-February/024889.html Change-Id: Ie4e226c454d8f736dbf1545440ca200104fd947c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-03-02 17:55:10 +00:00
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
Add mkspecs for 32-bit Mac OS X builds. Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-05-03 10:42:16 +00:00
Fix '=' alignment and replace tabs in *.conf (whitespace only change) Replace all tabs with proper space characters and consistently align the '=' characters. The default alignment for the '=' of 25 characters has been left as is to get a minimal diff. Lines with the '=' further to the right and those belonging to 'proper code (TM)' have not been touched. The work was mostly done using the following python script (might come in handy again...): import sys, re indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)') for fn in sys.argv[1:]: with open(fn, 'r+') as f: lines = [] nl_count = 0 continuity_indent = None for l in f: m = p.match(l) nl = l if m: n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1)) if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0: n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4 n_spaces = max(1, n_spaces) # we want at least one space before '='/'+=' nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n' continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$' elif continuity_indent: nl = ' '*continuity_indent + l.lstrip() if l[-2] != '\\': # check when to stop the continuation continuity_indent = None elif l.startswith('#'): nl = l.expandtabs(2) if l != nl: nl_count += 1 lines.append(nl) if nl_count > 0: print fn, nl_count, len(lines) f.seek(0) f.writelines(lines) f.truncate() Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-19 01:57:31 +00:00
QMAKE_CFLAGS += -arch i386
QMAKE_CXXFLAGS += -arch i386
QMAKE_LFLAGS += -arch i386
Add mkspecs for 32-bit Mac OS X builds. Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-05-03 10:42:16 +00:00
load(qt_config)
Reference in New Issue Copy Permalink