diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..ccfaa11 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,8 @@ +image: + - Visual Studio 2017 +install: + - set QTDIR=C:\Qt\5.12\mingw73_64 + - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw730_64\bin;%PATH% +build_script: + - qmake LimeReport.pro + - mingw32-make 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())); }