Try to make it build after 5.14.1 update

3 files changed, 32 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 6221fc7..5e3a43a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ libqicclient.a
 Makefile
 moc_*
 *.o
-qicclient.pro.user
+qicclient.pro.user*
 .qmake.stash
 *.swp
+Makefile.Arm*
+Makefile.X86*
diff --git a/libicclient b/libicclient
-Subproject 211c5e1a57aa8958d64b16d61fcf04dc48d4383
+Subproject 4443285897be4058891274e12d242dde25f0976
diff --git a/qicclient.pro b/qicclient.pro
index 4d7150b..321d18d 100644
--- a/qicclient.pro
+++ b/qicclient.pro
@@ -13,7 +13,34 @@ SOURCES += \
 	catalog.cxx \
 	basket.cxx \
 	client.cxx
-INCLUDEPATH += $$PWD/libicclient
-LIBS += $$PWD/libicclient/libicclient.a
+LIBS += -licclient
+
+contains(ANDROID_TARGET_ARCH,arm64-v8a) {
+	INCLUDEPATH += \
+		/usr/local/aarch64-linux-android/include/c++/4.9.x \
+		/usr/local/aarch64-linux-android/sysroot/usr/include
+	LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib
+}
+
+contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
+	INCLUDEPATH += \
+		/usr/local/arm-linux-androideabi/include/c++/4.9.x \
+		/usr/local/arm-linux-androideabi/sysroot/usr/include
+	LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib
+}
+
+contains(ANDROID_TARGET_ARCH,x86) {
+	INCLUDEPATH += \
+		/usr/local/i686-linux-android/include/c++/4.9.x \
+		/usr/local/i686-linux-android/sysroot/usr/include
+	LIBS += -L/usr/local/i686-linux-android/sysroot/usr/lib
+}
+
+contains(ANDROID_TARGET_ARCH,x86_64) {
+	INCLUDEPATH += \
+		/usr/local/x86_64-linux-android/include/c++/4.9.x \
+		/usr/local/x86_64-linux-android/sysroot/usr/include
+	LIBS += -L/usr/local/x86_64-linux-android/sysroot/usr/lib
+}
 
 debug: DEFINES += DEBUG