AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fd22e89593
qt5base-lts/mkspecs
History
Eskil Abrahamsen Blomfeldt 110d36fee8 REG: Fix make install on library projects on Android 
This is a partial revert of 39e04b0222.
The original change moved the special make install target path logic
into the logic for the app template to make it possible to remove the
condition that excluded builds inside the Qt directory. This was
to make it possible to build examples in the Qt directory for Android
without moving them. However, this broke user library projects,
specifically when they were part of a subdirs project and should
have been automatically installed into the Android package. This
patch brings back the logic but only enables it for library projects,
meaning that the only examples inside Qt which cannot be built
correctly are library projects (which didn't work anyway).

[ChangeLog][Android] Fixed regression in "make install" on
library projects on Android so they can be used inside subdirs
projects again.

Task-number: QTBUG-34781
Change-Id: Iabf53ed68845b2ddd4ae66656e1372c96185660e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2014-01-15 16:08:57 +01:00
..
aix-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
aix-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
aix-xlc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
aix-xlc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
android-g++ Prepare for printing support. 2013-11-23 15:46:19 +01:00
blackberry-armle-v7-qcc Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
blackberry-armv7le-qcc Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
blackberry-x86-qcc BlackBerry mkspecs: optimize linker flags 2012-11-26 15:11:59 +01:00
common disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
cygwin-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
darwin-g++ Add osx and darwin scopes to qmake. 2013-07-11 18:26:45 +02:00
devices Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
features REG: Fix make install on library projects on Android 2014-01-15 16:08:57 +01:00
freebsd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
freebsd-g++46 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
freebsd-icc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-acc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-acc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-acc-o64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpux-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpuxi-acc-32 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpuxi-acc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hpuxi-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
hurd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-cc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
irix-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-arm-gnueabi-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-clang Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
linux-clang-libc++ Add mkspec for clang using libc++ on Linux. 2013-12-09 22:23:59 +01:00
linux-cxx Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++ Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++-32 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++-64 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-g++-maemo Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
linux-icc Update the ICC spec on Linux to actually compile stuff 2013-10-30 19:02:01 +01:00
linux-icc-32 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
linux-icc-64 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-kcc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux-llvm Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-lsb-g++ Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-pgcc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
lynxos-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
macx-clang qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-clang-32 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++ qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++40 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++42 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-g++-32 qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-icc qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-ios-clang iOS: Use in-place string renaming to rename main() instead of ld 2014-01-06 20:58:28 +01:00
macx-llvm qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
macx-xcode macx-xcode: Change wrapper to write to QMAKESPEC to change mkspec 2013-10-14 12:07:53 +02:00
modules update readme to current reality 2012-01-27 13:55:27 +01:00
netbsd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
openbsd-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qnx-armv7le-qcc Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
qnx-x86-qcc Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
sco-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
sco-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-cc-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-cc-64-stlport Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
solaris-cc-stlport Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
solaris-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
solaris-g++-64 Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
tru64-cxx Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
tru64-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
unixware-cc Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
unixware-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
unsupported disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
win32-g++ Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
win32-icc Replace win32-icc/qplatformdefs.h with the MSVC one 2013-06-26 12:37:53 +02:00
win32-msvc2005 disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
win32-msvc2008 disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
win32-msvc2010 disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
win32-msvc2012 disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
win32-msvc2013 disable incremental linking for release_with_debug_info builds 2013-12-03 09:14:41 +01:00
wince60standard-armv4i-msvc2005 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
wince60standard-x86-msvc2005 Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
wince70embedded-armv4i-msvc2008 Remove not supported mkspecs for Windows CE. 2013-08-15 11:37:27 +02:00
wince70embedded-x86-msvc2008 Remove not supported mkspecs for Windows CE. 2013-08-15 11:37:27 +02:00
winphone-arm-msvc2012 build system support for WinRT 2013-09-14 09:51:14 +02:00
winphone-x86-msvc2012 build system support for WinRT 2013-09-14 09:51:14 +02:00
winrt-arm-msvc2012 build system support for WinRT 2013-09-14 09:51:14 +02:00
winrt-x64-msvc2012 build system support for WinRT 2013-09-14 09:51:14 +02:00
winrt-x86-msvc2012 build system support for WinRT 2013-09-14 09:51:14 +02:00