summaryrefslogtreecommitdiffstats
path: root/mkspecs/android-g++
Commit message (Collapse)AuthorAgeFilesLines
* Prepare for printing support.BogDan Vatra2013-11-231-1/+0
| | | | | | | | There is no real printing support though, it just prepares the land for bringing printing support for API-19+. Change-Id: Iabf78499f8fe1e4d2527e339cee5746acb8f3b3f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Clean up support library linkage on AndroidSimon Hausmann2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | * The explicitly linked support libraries like gnustl_shared, etc. can be linked as private libs, there's no need for them to show up in the .prl files of our libraries. * Removed the explicit linkage against libsupc++, which is a static library whos symbols are also available in libgnustl_shared. It is only needed when linking against gnustl_static, which we fortunately don't do. For QtQml on Android this is more than just cleanup. Without the first change, the libgnustl_shared comes early on in the link line, because it is a dependency of for example Qt5Network. Anything that qml.pro itself adds to LIBS comes afterwards. That is not intended, we want libgnustl_shared to come at the end of the link line, in order to make sure that the linker finds an overriding symbol from another library earlier in the link line first. The explicit linkage against libsupc++ affects the same, as that's the library that contains the symbol we want to override locally (__cxa_end_cleanup). (needed for QTBUG-33892) Change-Id: Id6dff733d6610ae8b15aa72f9cf60ae2c7834194 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Add qmake generation of Android deployment settingsEskil Abrahamsen Blomfeldt2013-09-191-1/+1
| | | | | | | | | | | | This outputs a json file with the necessary settings from qmake so that an external build tool can easily get the settings without having to parse the entire .pro source. Used by the androiddeployqt tool. Task-number: QTBUG-32856 Change-Id: I5d3ac0ab6a0350162d06b0a0bf0c9bcbd90d8b5a Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Make qmake.conf usable for getting arch in Qt CreatorEskil Abrahamsen Blomfeldt2013-08-281-1/+2
| | | | | | | | | | | | | Qt Creator needs to parse the qmake.conf in order to get the architecture for this Qt build when the Qt build is added. At this point it does not know that it's reading an android project, so it can't set the right environment variables. By moving the error to the bottom, we let Creator parse the whole file before getting an error, so that it can detect the options it needs to define the Qt version. Change-Id: I119523cb21e330dc5e957a6992476c4c3d4ab7b5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Use dwarf-2 until gdb >7.5 lands on Android NDK.BogDan Vatra2013-08-221-6/+6
| | | | | | | | Gcc 4.8 uses dwarf-4 by default which is not supported by the GDB that is officially shipped with the NDK. Change-Id: I913a038e095df52b0defd5d3da2606ef2e5456b7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Switch back to thumb for android armeabi.BogDan Vatra2013-08-221-6/+4
| | | | | | | | Add workaround for gcc 4.8 compile bug. Change-Id: Ie7a81ec25a79764989bbd9eb43dd5a8fbf442dfc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix SONAME handling on androidStephen Kelly2013-08-131-2/+1
| | | | | | | | | | Set the SONAME to the library name without the major version number appended, as android does not have the versioned symlinks. Change-Id: I41c504869019a393a3f112b2f7fc81c7ad5afa1c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: Fix crash when compiling release mode for armv5Eskil Abrahamsen Blomfeldt2013-08-061-2/+6
| | | | | | | | | | | | | | When building in thumb mode for armv5 applications will crash with SIGILL on startup. This has been observed on armv7 devices and emulators. It could be a bug in the gcc 4.4.3 toolchain, but since the other toolchains in the NDK have other bugs that make it impossible to use them for building, we need to disable thumb until the cross-compiler has been fixed. Task-number: QTBUG-31338 Change-Id: I22dd228158ef8c43b0b1d6e549d5725c1930536b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Add QT_NO_PRINTER to DEFINESSergio Ahumada2013-07-261-1/+1
| | | | | | | Printing is not enabled for Android. Change-Id: I5f589a036355fd63a7616fd57eeba1354d91281b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add QMAKE_NM to the mkspecsThiago Macieira2013-06-101-0/+1
| | | | | | | | | | | We'll use nm to get the listing of symbols in the next commit. The -P option is "portable", which sounds like a good idea. I don't have access to any of the commercial Unix systems, but I do remember them printing a different format than GNU binutils's nm. Change-Id: If6f80624bedaf2b1dabf608e16aa097d9910d739 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* MSYS: use cp -f for QMAKE_INSTALL_*Ray Donnelly2013-05-201-0/+4
| | | | | | | | | | | | ... in mingw-using specs because msysgit doesn't provide install.exe and Windows doesn't care about Unix permissions anyway. Task-number: QTBUG-31147 Change-Id: Ic8032ca1a970ef41381852b6c5c372b805a124f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Don't list all QMAKE_LIBS in QMAKE_LIBS_OPENGL_ES2.Stephen Kelly2013-04-231-1/+1
| | | | | | | There is no need to, and it confuses the generation of cmake files. Change-Id: I00c8751990e707cf32652babcb9af3e4b681561a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Fixes for building under MSYS.Ray Donnelly2013-04-171-0/+5
| | | | | | | Need to set MINGW_IN_SHELL to 1 and QMAKE_DIR_SEP to / Change-Id: If470f1a4617555d6bc551e8cdf917779d0e64e62 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Remove qdevice.pri warning in configure stepEskil Abrahamsen Blomfeldt2013-04-111-1/+2
| | | | | | | | Use the appropriate way to load the .pri file which also checks for its existence before loading it. Change-Id: I7d36da1593bb7fa1b5f6fd4d10b69e20c6aaa836 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix '=' alignment and replace tabs in *.conf (whitespace only change)Axel Waggershauser2013-03-271-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Introducing the Qt Android portPaul Olav Tvete2013-03-052-0/+365
Based on the Necessitas project by Bogdan Vatra. Contributors to the Qt5 project: BogDan Vatra <bogdan@kde.org> Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> hjk <hjk121@nokiamail.com> Oswald Buddenhagen <oswald.buddenhagen@digia.com> Paul Olav Tvete <paul.tvete@digia.com> Robin Burchell <robin+qt@viroteck.net> Samuel Rødal <samuel.rodal@digia.com> Yoann Lopes <yoann.lopes@digia.com> The full history of the Qt5 port can be found in refs/old-heads/android, SHA-1 249ca9ca2c7d876b91b31df9434dde47f9065d0d Change-Id: Iff1a7b2dbb707c986f2639e65e39ed8f22430120 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 21:16:55 +0000