diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2016-03-18 10:49:43 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2016-03-30 10:12:34 +0000 |
| commit | 91f8c9cc70bbfb752811cd29945fb37ff863d524 (patch) | |
| tree | a970c657be95cce9f1b2307a71d2c50cada42940 /src/corelib/kernel | |
| parent | 2a0ab43f18d8e84a4547d55c0bbc219c19925ea0 (diff) | |
Remove the traces of the discontinued android-no-sdk platform
Cleaning out the workarounds for the discontinued "Embedded Android"
platform of Boot2Qt.
Change-Id: I0ff9d770e82a43457fb7e5da0428f4597ead4038
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index adcc9c5581..8c16e10c27 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -194,7 +194,7 @@ qqnx_pps { kernel/qppsobjectprivate_p.h } -android:!android-no-sdk { +android { SOURCES += \ kernel/qjnionload.cpp \ kernel/qjnihelpers.cpp \ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 6ccc7b729b..879e218e09 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2146,7 +2146,7 @@ QString QCoreApplication::applicationFilePath() } #endif #if defined( Q_OS_UNIX ) -# if defined(Q_OS_LINUX) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)) +# if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) // Try looking for a /proc/<pid>/exe symlink first which points to // the absolute path of the executable QFileInfo pfi(QString::fromLatin1("/proc/%1/exe").arg(getpid())); |