diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2020-12-23 12:45:12 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-01-20 14:10:38 +0100 |
| commit | 89f1e45e487ca6ae3998699153b10c343aef25d9 (patch) | |
| tree | c6df17375038777a134fba0251cd78630880e363 /qtlocation.pro | |
| parent | c50cf545fce1e4b61255c85fd8c261df6fe4d663 (diff) | |
| download | qtlocation-89f1e45e487ca6ae3998699153b10c343aef25d9.tar.gz | |
QtPositioning: adapt to Qt6
Make QtPositioning module buildable under Qt6:
- remove calls to deleted QMetaType-registration methods
- replace int -> qsizetype where it prevents the code from being
compiled
- fix some deprecation warnings
- fix library dependencies in .pro file for building tests
- fix weatherinfo example
For now only qmake is supported. CMake support will be done in
scope of a separate patch.
Geoflickr example is yet to be ported, as it requires extracting
XmlListModel from xmlpatterns.
QtLocation is also skipped for now, as it seems to require
heavy refactoring due to changes in QSGMaterialShader interface.
QtLocation build is disabled in qmake for now.
Task-number: QTBUG-89853
Change-Id: I8cc4da6efabe32ce114701219d5431f8480bee3b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'qtlocation.pro')
| -rw-r--r-- | qtlocation.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qtlocation.pro b/qtlocation.pro index 2577ff2d..6f58f846 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -1,3 +1,8 @@ +# Only QtPositioning build is supported for now. +# Porting QtLocation to Qt6 requires heavy refactoring and will be done later. +# If you want to enable QtLocation build (for development reasons, probably), +# remove the SKIP_QT_LOCATION variable definition in src/src.pro + requires(!wasm) load(configure) qtCompileTest(gypsy) |