diff --git a/examples/Qt6/cl-repl/qml/fonts/Hack-Bold.ttf b/examples/Qt6/cl-repl/qml/fonts/Hack-Bold.ttf
deleted file mode 100644
index 7ff4975..0000000
Binary files a/examples/Qt6/cl-repl/qml/fonts/Hack-Bold.ttf and /dev/null differ
diff --git a/examples/Qt6/cl-repl/qml/fonts/Hack-Regular.ttf b/examples/Qt6/cl-repl/qml/fonts/Hack-Regular.ttf
deleted file mode 100644
index 92a90cb..0000000
Binary files a/examples/Qt6/cl-repl/qml/fonts/Hack-Regular.ttf and /dev/null differ
diff --git a/examples/Qt6/cl-repl/qml/fonts/fontawesome-webfont.ttf b/examples/Qt6/cl-repl/qml/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 35acda2..0000000
Binary files a/examples/Qt6/cl-repl/qml/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/examples/Qt6/cl-repl/qml/img/paren-close.png b/examples/Qt6/cl-repl/qml/img/paren-close.png
deleted file mode 100644
index 41dadd8..0000000
Binary files a/examples/Qt6/cl-repl/qml/img/paren-close.png and /dev/null differ
diff --git a/examples/Qt6/cl-repl/qml/img/paren-open.png b/examples/Qt6/cl-repl/qml/img/paren-open.png
deleted file mode 100644
index 01f150a..0000000
Binary files a/examples/Qt6/cl-repl/qml/img/paren-open.png and /dev/null differ
diff --git a/examples/advanced-qml-auto-reload/app.pro b/examples/advanced-qml-auto-reload/app.pro
index 85153c8..79b4304 100644
--- a/examples/advanced-qml-auto-reload/app.pro
+++ b/examples/advanced-qml-auto-reload/app.pro
@@ -53,7 +53,6 @@ win32 {
 }
 
 android {
-  QT          += androidextras
   DEFINES     += INI_ASDF
   DEFINES     -= DESKTOP_APP
   INCLUDEPATH = $$ECL/include
@@ -64,6 +63,13 @@ android {
   LIBS        += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
   LIBS        += -L../../../platforms/android/lib
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -91,9 +97,31 @@ ios {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS    += -Ltmp -lapp
diff --git a/examples/camera/app.pro b/examples/camera/app.pro
index 4a29203..71a1899 100644
--- a/examples/camera/app.pro
+++ b/examples/camera/app.pro
@@ -53,7 +53,6 @@ win32 {
 }
 
 android {
-  QT          += androidextras
   DEFINES     -= DESKTOP_APP
   INCLUDEPATH = $$ECL/include
   ECL_VERSION = $$lower($$system($$ECL/../ecl-android-host/bin/ecl -v))
@@ -63,6 +62,13 @@ android {
   LIBS        += -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
   LIBS        += -L../../../platforms/android/lib
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -91,9 +97,31 @@ ios {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS        += -Ltmp -lapp
diff --git a/examples/clog-demo/app.pro b/examples/clog-demo/app.pro
index 2febb9c..dc09c34 100644
--- a/examples/clog-demo/app.pro
+++ b/examples/clog-demo/app.pro
@@ -53,7 +53,6 @@ win32 {
 }
 
 android {
-  QT          += androidextras
   DEFINES     -= DESKTOP_APP
   INCLUDEPATH = $$ECL/include
   ECL_VERSION = $$lower($$system($$ECL/../ecl-android-host/bin/ecl -v))
@@ -63,6 +62,13 @@ android {
   LIBS        += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
   LIBS        += -L../../../platforms/android/lib
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -89,9 +95,31 @@ ios {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS    += -Ltmp -lapp
diff --git a/examples/swank-server/app.pro b/examples/swank-server/app.pro
index beaeabd..12316cf 100644
--- a/examples/swank-server/app.pro
+++ b/examples/swank-server/app.pro
@@ -53,7 +53,6 @@ win32 {
 }
 
 android {
-  QT          += androidextras
   DEFINES     += INI_ASDF
   DEFINES     -= DESKTOP_APP
   INCLUDEPATH = $$ECL/include
@@ -64,6 +63,13 @@ android {
   LIBS        += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
   LIBS        += -L../../../platforms/android/lib
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -91,9 +97,31 @@ ios {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS    += -Ltmp -lapp
diff --git a/examples/tilt-sensor/app.pro b/examples/tilt-sensor/app.pro
index c7f9018..06fa212 100644
--- a/examples/tilt-sensor/app.pro
+++ b/examples/tilt-sensor/app.pro
@@ -47,12 +47,19 @@ win32 {
 }
 
 android {
-  QT          += androidextras sensors
+  QT          += sensors
   DEFINES     -= DESKTOP_APP
   INCLUDEPATH = $$ECL/include
   LIBS        = -L$$ECL/lib -lecl
   LIBS        += -L../../../platforms/android/lib
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -75,9 +82,31 @@ ios {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS    += -Ltmp -lapp
diff --git a/examples/wear-os-gps/app.pro b/examples/wear-os-gps/app.pro
index 84670ef..9776787 100644
--- a/examples/wear-os-gps/app.pro
+++ b/examples/wear-os-gps/app.pro
@@ -48,7 +48,6 @@ win32 {
 }
 
 android {
-  QT          += androidextras
   DEFINES     -= DESKTOP_APP
   DEFINES     += QT_EXTENSION
   INCLUDEPATH = $$ECL/include
@@ -57,6 +56,13 @@ android {
   HEADERS     += cpp/qt.h
   SOURCES     += cpp/qt.cpp
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -82,9 +88,31 @@ ios {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS    += -Ltmp -lapp
diff --git a/examples/wear-os-heart/app.pro b/examples/wear-os-heart/app.pro
index 064538b..1896806 100644
--- a/examples/wear-os-heart/app.pro
+++ b/examples/wear-os-heart/app.pro
@@ -45,7 +45,7 @@ win32 {
 }
 
 android {
-  QT          += androidextras sensors
+  QT          += sensors
   DEFINES     -= DESKTOP_APP
   DEFINES     += QT_EXTENSION
   INCLUDEPATH = $$ECL/include ../../../src/cpp
@@ -54,6 +54,13 @@ android {
   HEADERS     += cpp/qt.h
   SOURCES     += cpp/qt.cpp
 
+  equals(QT_MAJOR_VERSION, 6) {
+    QT += core-private
+  }
+  lessThan(QT_MAJOR_VERSION, 6) {
+    QT += androidextras
+  }
+
   ANDROID_EXTRA_LIBS         += $$ECL/lib/libecl.so
   ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 
@@ -65,9 +72,31 @@ android {
 }
 
 32bit {
-  LIBS += -llqml32 -llisp32
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32_armeabi-v7a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml32
+    }
+  }
+  !android {
+    LIBS += -llqml32
+  }
+  LIBS += -llisp32
 } else {
-  LIBS += -llqml -llisp
+  android {
+    equals(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml_arm64-v8a
+    }
+    lessThan(QT_MAJOR_VERSION, 6) {
+      LIBS += -llqml
+    }
+  }
+  !android {
+    LIBS += -llqml
+  }
+  LIBS += -llisp
 }
 
 LIBS    += -Ltmp -lapp