From 6d1444566d052a21287caea0798e60f02e3e0f4c Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 27 Feb 2020 19:34:52 +0300 Subject: [PATCH 1/5] Endless loop on adding not initialized QSqlQueryModels has been fixed --- common.pri | 2 +- limereport/lrdatadesignintf.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 6987c1e..a31bb50 100644 --- a/common.pri +++ b/common.pri @@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 5 -LIMEREPORT_VERSION_RELEASE = 38 +LIMEREPORT_VERSION_RELEASE = 39 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp index eb4b564..aca04e3 100644 --- a/limereport/lrdatadesignintf.cpp +++ b/limereport/lrdatadesignintf.cpp @@ -190,8 +190,10 @@ ModelToDataSource::ModelToDataSource(QAbstractItemModel* model, bool owned) { Q_ASSERT(model); if (model){ - while (model->canFetchMore(QModelIndex())) + while (model->canFetchMore(QModelIndex())){ model->fetchMore(QModelIndex()); + if (model->rowCount() <= 0) break; + } connect(model, SIGNAL(destroyed()), this, SLOT(slotModelDestroed())); connect(model, SIGNAL(modelReset()), this, SIGNAL(modelStateChanged())); } From 51312740734d933811a31599afdd783a4872aa30 Mon Sep 17 00:00:00 2001 From: fralx Date: Mon, 2 Mar 2020 13:37:33 +0300 Subject: [PATCH 2/5] Create .appveyor.yml --- .appveyor.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..6139827 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,6 @@ +install: + - set QTDIR=C:\Qt\5.11.0\mingw53_32 + - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw530_32\bin;%PATH% +build_script: + - qmake LimeReport.pro + - mingw32-make From 6b3f54a48bcce4c29cbd94a90dda87065661c3bc Mon Sep 17 00:00:00 2001 From: fralx Date: Mon, 2 Mar 2020 13:41:24 +0300 Subject: [PATCH 3/5] Update .appveyor.yml --- .appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6139827..dc9dbcb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,8 @@ +image: + - Visual Studio 2017 install: - - set QTDIR=C:\Qt\5.11.0\mingw53_32 - - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw530_32\bin;%PATH% + - set QTDIR=C:\Qt\5.12\mingw73_64 + - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw73_64\bin;%PATH% build_script: - qmake LimeReport.pro - mingw32-make From d3e45ccaee1657714fa4873527d06551704d805a Mon Sep 17 00:00:00 2001 From: fralx Date: Mon, 2 Mar 2020 13:46:23 +0300 Subject: [PATCH 4/5] Update .appveyor.yml --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index dc9dbcb..97fc9b1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,8 @@ image: - Visual Studio 2017 install: - - set QTDIR=C:\Qt\5.12\mingw73_64 - - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw73_64\bin;%PATH% + - set QTDIR=C:\Qt\5.12\mingw730_64 + - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw730_64\bin;%PATH% build_script: - qmake LimeReport.pro - mingw32-make From 23d348dd7dc6d92f291aab661d856054795631d6 Mon Sep 17 00:00:00 2001 From: fralx Date: Mon, 2 Mar 2020 13:46:58 +0300 Subject: [PATCH 5/5] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 97fc9b1..ccfaa11 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ image: - Visual Studio 2017 install: - - set QTDIR=C:\Qt\5.12\mingw730_64 + - set QTDIR=C:\Qt\5.12\mingw73_64 - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw730_64\bin;%PATH% build_script: - qmake LimeReport.pro