diff options
| author | KitsuneRal <KitsuneRal@users.noreply.github.com> | 2016-06-02 07:13:45 +0900 |
|---|---|---|
| committer | KitsuneRal <KitsuneRal@users.noreply.github.com> | 2016-06-02 07:13:45 +0900 |
| commit | c3b7873c1c0c78b271b9e04751f882b1e6c64ed8 (patch) | |
| tree | cc8b4ec6822779c675b2c33c366c1517f9dd68b9 | |
| parent | 43ecbf3135687b2e5a5a604a902f992139cce428 (diff) | |
| parent | 15699734c64c1e2359f9f1f3c74fd1f4c4e23a27 (diff) | |
| download | libquotient-c3b7873c1c0c78b271b9e04751f882b1e6c64ed8.tar.gz libquotient-c3b7873c1c0c78b271b9e04751f882b1e6c64ed8.zip | |
Merge pull request #10 from ilpianista/master
Relax the Qt requirements down to 5.2.0
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | jobs/passwordlogin.cpp | 2 | ||||
| m--------- | kcoreaddons | 0 |
3 files changed, 4 insertions, 4 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 9f0cb2e1..231dcce5 100644 --- a/jobs/passwordlogin.cpp +++ b/jobs/passwordlogin.cpp @@ -74,7 +74,7 @@ QString PasswordLogin::apiPath() const QJsonObject PasswordLogin::data() const { 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 -Subproject f20b804c6068433ddb5e883fc13ddfc5adbd9d9 +Subproject 7ac7a605923f0bb2f0f367f6069a101a24bead9 |