diff --git a/pip b/pip index 2c5e4e9..abe8b76 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2c5e4e9b4c8e72750232494514d3d552e28a6f57 +Subproject commit abe8b76046e882b8d89f7e957f5a39a336012f49 diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 6ca6800..2808b14 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(qad) set(_QAD_MAJOR 1) set(_QAD_MINOR 1) -set(_QAD_REVISION 0) -set(_QAD_SUFFIX ) +set(_QAD_REVISION 1) +set(_QAD_SUFFIX alpha) set(_QAD_COMPANY SHS) set(_QAD_DOMAIN org.SHS) diff --git a/qad/utils/qad_locations.cpp b/qad/utils/qad_locations.cpp index 36164f2..266fab5 100644 --- a/qad/utils/qad_locations.cpp +++ b/qad/utils/qad_locations.cpp @@ -112,5 +112,5 @@ QStringList QAD::availableTranslations() { } } } - return ret.toList(); + return ret.values(); } diff --git a/qad/utils/qad_locations.h b/qad/utils/qad_locations.h index 860ce7f..8fba7c0 100644 --- a/qad/utils/qad_locations.h +++ b/qad/utils/qad_locations.h @@ -34,8 +34,8 @@ namespace QAD { //! Create QStandardPaths::writableLocation() directory //! and returns file name ".". //! Extension is selected by "loc": - //! * ctConfig - "conf" - //! * ctCache - "cache" + //! * ltConfig - "conf" + //! * ltCache - "cache" QAD_EXPORT QString userPath(LocationType loc, QString name = QString());