From 15699734c64c1e2359f9f1f3c74fd1f4c4e23a27 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Mon, 30 May 2016 23:51:38 +0200 Subject: Require Qt 5.2.0 --- CMakeLists.txt | 6 +++--- jobs/passwordlogin.cpp | 2 +- kcoreaddons | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0203f2dc..8b077275 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,9 @@ set(CMAKE_AUTOMOC ON) set( BUNDLE_KCOREADDONS "AUTO" CACHE STRING "Build own KCoreAddons, one of ON, OFF and AUTO" ) set( KCOREADDONS_DIR "kcoreaddons" CACHE STRING "Local path to bundled KCoreAddons sources, if own KCoreAddons is built" ) -find_package(Qt5Core 5.3.0) # For JSON (de)serialization -find_package(Qt5Network 5.3.0) # For networking -find_package(Qt5Gui 5.3.0) # For userpics +find_package(Qt5Core 5.2.0) # For JSON (de)serialization +find_package(Qt5Network 5.2.0) # For networking +find_package(Qt5Gui 5.2.0) # For userpics if ( (NOT BUNDLE_KCOREADDONS STREQUAL "ON") AND (NOT BUNDLE_KCOREADDONS STREQUAL "OFF") diff --git a/jobs/passwordlogin.cpp b/jobs/passwordlogin.cpp index d989815f..d882e25c 100644 --- a/jobs/passwordlogin.cpp +++ b/jobs/passwordlogin.cpp @@ -74,7 +74,7 @@ QString PasswordLogin::apiPath() QJsonObject PasswordLogin::data() { QJsonObject json; - json.insert("type", "m.login.password"); + json.insert("type", QLatin1String("m.login.password")); json.insert("user", d->user); json.insert("password", d->password); return json; diff --git a/kcoreaddons b/kcoreaddons index f20b804c..7ac7a605 160000 --- a/kcoreaddons +++ b/kcoreaddons @@ -1 +1 @@ -Subproject commit f20b804c6068433ddb5e883fc13ddfc5adbd9d94 +Subproject commit 7ac7a605923f0bb2f0f367f6069a101a24bead9f -- cgit v1.2.3