summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2022-02-11 08:19:25 +0100
committerAndreas Buhr <andreas.buhr@qt.io>2022-02-11 18:43:02 +0100
commit799dd78ae611aaf0649ca7ca38d03d5250dec127 (patch)
treea3666a2a0769f3893437d37740a692f309777a8a
parentada41e2482bad1bdf53ac49a5d1fbf1585406c3a (diff)
downloadqtlocation-799dd78ae611aaf0649ca7ca38d03d5250dec127.tar.gz
Bump version to 6.4.0
Change-Id: Id5c7eb4794f0e62e8df15e74e55f1827b812219b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
-rw-r--r--.cmake.conf2
-rw-r--r--.qmake.conf11
2 files changed, 1 insertions, 12 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 75aec070..28006083 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.3.0")
+set(QT_REPO_MODULE_VERSION "6.4.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
diff --git a/.qmake.conf b/.qmake.conf
deleted file mode 100644
index dd5c5d5b..00000000
--- a/.qmake.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-load(qt_build_config)
-CONFIG += warning_clean
-
-DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-
-MODULE_VERSION = 6.3.0
-
-# Adds a way to debug location. The define is needed for multiple subprojects as they
-# include the essential headers.
-# Alternatively, the define can be passed directly to qmake
-# DEFINES+=QT_LOCATION_DEBUG