From f32a6cfb6b6236533508901f114ab57396da8ff3 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Jun 2019 13:47:23 +0200 Subject: Fix cmake configure step on Android Now that ANDROID_EMBEDDED is not set by default anymore, we start descending into Android specific sub-directories. This patch generates a stub file but the Java bits still need to be ported. Change-Id: Icbfc3ad2c1ef266980161bca081c7c4275873efd Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- src/plugins/bearer/android/CMakeLists.txt | 5 +++++ src/plugins/bearer/android/src/CMakeLists.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/plugins/bearer/android/CMakeLists.txt create mode 100644 src/plugins/bearer/android/src/CMakeLists.txt diff --git a/src/plugins/bearer/android/CMakeLists.txt b/src/plugins/bearer/android/CMakeLists.txt new file mode 100644 index 0000000000..a5f5393378 --- /dev/null +++ b/src/plugins/bearer/android/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from android.pro. + +add_subdirectory(src) +# TODO: +# add_subdirectory(jar) diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt new file mode 100644 index 0000000000..260e908170 --- /dev/null +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from src.pro. + +##################################################################### +## qandroidbearer Plugin: +##################################################################### + +add_qt_plugin(qandroidbearer + TYPE bearer + SOURCES + ../../qbearerengine_impl.h + ../../qnetworksession_impl.cpp ../../qnetworksession_impl.h + main.cpp + qandroidbearerengine.cpp qandroidbearerengine.h + wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h + INCLUDE_DIRECTORIES + wrappers + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Network +) + +#### Keys ignored in scope 1:.:.:src.pro:: +# PLUGIN_CLASS_NAME = "QAndroidBearerEnginePlugin" +# _LOADED = "qt_plugin" -- cgit v1.2.3