diff --git a/common.pri b/common.pri index c15fe14..8eee2c5 100644 --- a/common.pri +++ b/common.pri @@ -1,5 +1,13 @@ CONFIG += build_translations CONFIG += zint + +#greaterThan(QT_MAJOR_VERSION, 4) { +# QT += uitools +#} +#lessThan(QT_MAJOR_VERSION, 5){ +# CONFIG += uitools +#} + ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 CONFIG(release, debug|release){ diff --git a/demo_r1/demo_reports/demoDialog.ui b/demo_r1/demo_reports/demoDialog.ui new file mode 100644 index 0000000..8f387f9 --- /dev/null +++ b/demo_r1/demo_reports/demoDialog.ui @@ -0,0 +1,82 @@ + + + Dialog + + + + 0 + 0 + 400 + 300 + + + + Dialog + + + + + + + + + + Message + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/demo_r1/demo_reports/dialogDemo.lrxml b/demo_r1/demo_reports/dialogDemo.lrxml new file mode 100644 index 0000000..eb5780a --- /dev/null +++ b/demo_r1/demo_reports/dialogDemo.lrxml @@ -0,0 +1,93 @@ + + + + + + + page1 + + + + + + + + ReportPage1 + + + + TextItem1 + + + + + ReportPage1 + + + + + + + $S{Dialog.lineEdit.text} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + datasources + + + + + + + + + + + + Dialog + + + + Dialog.exec()==1 + + + +