python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-09-23 16:49:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/ds_from_script

Browse Source
This commit is contained in:
Arin Alexander
2019-01-29 23:20:58 +03:00
parent a25523c908 aa4e1204da
commit 48c39432ce
25 changed files with 602 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/lrglobal.h
View File

@@ -95,6 +95,7 @@ namespace Const{
const int SCENE_MARGIN = 50;
const QString FUNCTION_MANAGER_NAME = "LimeReport";
const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-=");
const int DEFAULT_TAB_INDENTION = 4;
}
QString extractClassName(QString className);
@@ -157,6 +158,7 @@ namespace Const{
static inline QJSValue getJSValue(QJSEngine &e, T *p)
{
QJSValue res = e.newQObject(p);
QQmlEngine::setObjectOwnership(p, QQmlEngine::CppOwnership);
return res;
}
#else