Skip to content

Commit

Permalink
purge obsolete project (qt < 5.15)
Browse files Browse the repository at this point in the history
  • Loading branch information
janbar committed Oct 13, 2023
1 parent 8473f95 commit 3f9b718
Show file tree
Hide file tree
Showing 52 changed files with 6 additions and 9,177 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ find_package(Qt5Gui REQUIRED)
find_package(Qt5Qml REQUIRED)
find_package(Qt5Quick REQUIRED)

set(QT_MIN_VERSION 5.12.0)
set(QT_MIN_VERSION 5.15.0)
find_package(Qt5QuickControls2 ${QT_MIN_VERSION} REQUIRED)

if(ANDROID)
Expand Down Expand Up @@ -173,8 +173,8 @@ endif()

add_definitions(-DAPP_VERSION="${APP_VERSION}")

if(Qt5Core_VERSION VERSION_LESS 5.15.0)
qt5_add_resources(osmin-resources gui/osmin_controls2_509.qrc)
if(Qt5Core_VERSION VERSION_LESS 5.15.2)
message(FATAL_ERROR "Qt version not supported")
else()
qt5_add_resources(osmin-resources gui/osmin_controls2_515.qrc)
endif()
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ You can install osmin through the [IzzyOnDroid](https://apt.izzysoft.de/fdroid/i
Alternatively the APKs are available on the Release page, for armv7(32bits) and arm64(64bits) devices.

## Develop/debug osmin
You can build and test osmin on Unix (Linux, BSD, MacOS 10.14) supported by Qt 5.12. Before build from source you have to install the following dependencies.
You can build and test osmin on Unix (Linux, BSD, MacOS 10.14) supported by Qt 5.15. Before build from source you have to install the following dependencies.

git, cmake, clang/clang++ (**>=12.0**), OpenMP, Qt5Core (**>=5.12**), Qt5Gui, Qt5Qml, Qt5Quick, Qt5QuickControls2, Qt5Widgets, Qt5Xml, Qt5Svg, Qt5Network, Qt5Sensors, Qt5Multimedia, Qt5RemoteObjects, Qt5Positioning.
git, cmake, clang/clang++ (**>=12.0**), OpenMP, Qt5Core (**>=5.15**), Qt5Gui, Qt5Qml, Qt5Quick, Qt5QuickControls2, Qt5Widgets, Qt5Xml, Qt5Svg, Qt5Network, Qt5Sensors, Qt5Multimedia, Qt5RemoteObjects, Qt5Positioning.

As example type the following on Ubuntu (>=20.04) to install all requirements.
As example type the following on Ubuntu (>=22.04) to install all requirements.
```
sudo apt install git cmake clang curl wget libomp-dev liblzma-dev libqt5remoteobjects5-bin libqt5quickwidgets5 libqt5quickcontrols2-5 libqt5qmlmodels5 libqt5qml5 libqt5positioning5 libqt5remoteobjects5-dev libqt5svg5-dev libqt5sensors5-dev qtquickcontrols2-5-dev qtmultimedia5-dev qtpositioning5-dev qml-module-qtgraphicaleffects qml-module-qtquick2 qml-module-qtquick-layouts qml-module-qtquick-controls2 qml-module-qt-labs-settings
```
Expand Down
72 changes: 0 additions & 72 deletions android/AndroidManifest.xml.in.ndk18

This file was deleted.

39 changes: 0 additions & 39 deletions gui/controls2_509/Banner.qml

This file was deleted.

Loading

0 comments on commit 3f9b718

Please sign in to comment.