From a4eada744108975ac67a9731ed901be9fb1c5b4d Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 29 Apr 2020 17:21:24 +0300 Subject: [PATCH 1/3] update to PIP 1.14 --- cd_utils/cdutils_interface.cpp | 2 +- cd_utils/cdutils_types.cpp | 2 +- pip | 2 +- qad/utils/qpiconfig.h | 39 ++++++++++++++++++---------------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/cd_utils/cdutils_interface.cpp b/cd_utils/cdutils_interface.cpp index 2967801..a37d818 100644 --- a/cd_utils/cdutils_interface.cpp +++ b/cd_utils/cdutils_interface.cpp @@ -135,7 +135,7 @@ bool Interface::configure(const PIString & config) { PIConfig conf(config, PIIODevice::ReadOnly); PIConfig::Entry & e(conf.getValue(core->typeLetter(s->cd_type_))); bool ret = false; - setFileName(e.getValue("file", file(), &ret)); + setFileName(e.getValue("file", file(), &ret).toString()); return ret; } diff --git a/cd_utils/cdutils_types.cpp b/cd_utils/cdutils_types.cpp index ae8ce05..cccfb3d 100644 --- a/cd_utils/cdutils_types.cpp +++ b/cd_utils/cdutils_types.cpp @@ -524,7 +524,7 @@ void CDSection::read(const void * ep) { case CDType::cdNull: break; case CDType::cdK: c = CDType(id, e->getValue("v").comment(), e->getValue("v").type(), e->getValue("v").value(), e->getValue("f").value(), e->getValue("f").comment(), cd_type_); - ev = e->getValue("ev", ""); + ev = e->getValue("ev", "").value(); if (!ev.isEmpty()) c.enum_values = c.parseEnumComment(ev); break; diff --git a/pip b/pip index 6a6907b..3454971 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 6a6907b136ebdfbce020e711e71ccc8bcb138c98 +Subproject commit 3454971100a61497450c843cc6d177a523b38dbc diff --git a/qad/utils/qpiconfig.h b/qad/utils/qpiconfig.h index 00ccd9c..4c2109b 100644 --- a/qad/utils/qpiconfig.h +++ b/qad/utils/qpiconfig.h @@ -149,25 +149,28 @@ public: bool isEntryExists(const QString & name) const {return entryExists(this, name);} - bool toBool() const {return (_value.toLower().trimmed() == "true" || _value.toLower().trimmed() == "yes" || _value.toLower().trimmed() == "on" || _value.toInt() > 0);} - char toChar() const {return (_value.isEmpty() ? 0 : _value[0].toLatin1());} - short toShort() const {return _value.toShort();} - int toInt() const {return QString2int(_value);} - long toLong() const {return QString2int(_value);} - uchar toUChar() const {return QString2int(_value);} - ushort toUShort() const {return QString2int(_value);} - uint toUInt() const {return QString2int(_value);} - ulong toULong() const {return QString2int(_value);} - float toFloat() const {return _value.toFloat();} - double toDouble() const {return _value.toDouble();} - QString toString() const {return _value;} + bool toBool() const {return (_value.toLower().trimmed() == "true" + || _value.toLower().trimmed() == "yes" + || _value.toLower().trimmed() == "on" + || _value.toInt() > 0);} + char toChar() const {return (_value.isEmpty() ? 0 : _value[0].toLatin1());} + short toShort() const {return _value.toShort();} + int toInt() const {return QString2int(_value);} + long toLong() const {return QString2int(_value);} + uchar toUChar() const {return QString2int(_value);} + ushort toUShort() const {return QString2int(_value);} + uint toUInt() const {return QString2int(_value);} + ulong toULong() const {return QString2int(_value);} + float toFloat() const {return _value.toFloat();} + double toDouble() const {return _value.toDouble();} + QString toString() const {return _value;} QStringList toStringList() const {return _value.split("%|%");} - QColor toColor() const {return QString2QColor(_value);} - QRect toRect() const {return QString2QRect(_value);} - QRectF toRectF() const {return QString2QRectF(_value);} - QPoint toPoint() const {return QString2QPoint(_value);} - QPointF toPointF() const {return QString2QPointF(_value);} - QByteArray toByteArray() const {return QString2QByteArray(_value);} + QColor toColor() const {return QString2QColor(_value);} + QRect toRect() const {return QString2QRect(_value);} + QRectF toRectF() const {return QString2QRectF(_value);} + QPoint toPoint() const {return QString2QPoint(_value);} + QPointF toPointF() const {return QString2QPointF(_value);} + QByteArray toByteArray() const {return QString2QByteArray(_value);} private: static bool compare(const QPIConfig::Entry * f, const QPIConfig::Entry * s) {return f->_line < s->_line;} From c8369d2bd911d788957d47d1218d932ccfad29a0 Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 29 Apr 2020 17:44:37 +0300 Subject: [PATCH 2/3] pip fixes --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 3454971..0ac382e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3454971100a61497450c843cc6d177a523b38dbc +Subproject commit 0ac382e6287b030ac128ad51d4052d80caf75195 From ad5bb3a750bd8fad4b0567ef72910568573c08c9 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 29 Apr 2020 18:13:19 +0300 Subject: [PATCH 3/3] cmake_android.bat --- cmake_android.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_android.bat b/cmake_android.bat index 21cee85..94d9290 100644 --- a/cmake_android.bat +++ b/cmake_android.bat @@ -43,7 +43,7 @@ set Qt5_ROOT=%ANDROID_QT5_DIR%\lib\cmake rem set Qt5_DIR=%Qt5_ROOT%\Qt5 if NOT [%QARCH%]==[] ( @echo on - cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%_PLATFORM_% -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -DQGLENGINE=0 -DQt5_DIR=%Qt5_ROOT%\Qt5 -DQt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -DQt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -DQt5UiTools_DIR=%Qt5_ROOT%\Qt5UiTools -DQt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -DQt5Core_DIR=%Qt5_ROOT%\Qt5Core -DQt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -DQt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -DQt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script -DQt5Positioning_DIR=%Qt5_ROOT%\Qt5Positioning -DQt5Network_DIR=%Qt5_ROOT%\Qt5Network -DQt5Qml_DIR=%Qt5_ROOT%\Qt5Qml -DQt5Quick_DIR=%Qt5_ROOT%\Qt5Quick -DQt5QuickWidgets_DIR=%Qt5_ROOT%\Qt5QuickWidgets %~3 %~4 %~5 %~6 + cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%_PLATFORM_% -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -DQGLENGINE=0 -DQt5_DIR=%Qt5_ROOT%\Qt5 -DQt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -DQt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -DQt5UiTools_DIR=%Qt5_ROOT%\Qt5UiTools -DQt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -DQt5Core_DIR=%Qt5_ROOT%\Qt5Core -DQt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -DQt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -DQt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script -DQt5Positioning_DIR=%Qt5_ROOT%\Qt5Positioning -DQt5Network_DIR=%Qt5_ROOT%\Qt5Network -DQt5Qml_DIR=%Qt5_ROOT%\Qt5Qml -DQt5Quick_DIR=%Qt5_ROOT%\Qt5Quick -DQt5QuickWidgets_DIR=%Qt5_ROOT%\Qt5QuickWidgets -DQt5QmlModels_DIR=%Qt5_ROOT%\Qt5QmlModels -DQt5AndroidExtras_DIR=%Qt5_ROOT%\Qt5AndroidExtras %~3 %~4 %~5 %~6 ) else ( @echo on cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%_PLATFORM_% -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 %~3 %~4 %~5 %~6