summaryrefslogtreecommitdiffstats
path: root/mkspecs/android-g++/qmake.conf
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-01 13:05:51 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-01 13:08:42 +0200
commitccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (patch)
treea65fb418e4e0ce27e6cd73f65500e7cc00bbf106 /mkspecs/android-g++/qmake.conf
parentd52b00e1d3cc60c81b54a89d6da488dc4bbce384 (diff)
parent079f2bf5d8a4221b821ec8062affe2efaa9668a0 (diff)
Merge remote-tracking branch 'origin/release' into stable
This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
Diffstat (limited to 'mkspecs/android-g++/qmake.conf')
-rw-r--r--mkspecs/android-g++/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index 608e64f3d4..78b484fdb5 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -3,7 +3,7 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = android
QMAKE_COMPILER = gcc
-CONFIG += android_install unversioned_soname android_deployment_settings
+CONFIG += android_install unversioned_soname unversioned_libname android_deployment_settings
include(../common/linux.conf)
include(../common/gcc-base-unix.conf)