AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a6b8b03f86
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
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
Reorder directives in macOS mkspecs to match iOS, tvOS, and watchOS Change-Id: Ic365f66908b97a18c72b732b73b65d77a28e91be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2016-08-20 01:28:38 +00:00
include(../common/macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.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
load(qt_config)
Reference in New Issue Copy Permalink