Skip to content

Commit

Permalink
Merge branch 'master' into issue953
Browse files Browse the repository at this point in the history
  • Loading branch information
fvacek authored Dec 29, 2023
2 parents 3c559f8 + 6ba78dd commit 65cdc82
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ Qt6 version
```
git clone https://github.com/Quick-Event/quickbox.git
cd quickbox
git switch qt6
git submodule update --init --recursive
cmake -S . -B build -DCMAKE_PREFIX_PATH:PATH=~/app/qt/6.5.1/gcc_64 -DQF_BUILD_QML_PLUGINS=ON --install-prefix `pwd`/build/install
git switch qe3
git submodule update --init
cmake -S . -B build -DCMAKE_PREFIX_PATH:PATH=~/app/qt/6.6.1/gcc_64 -DQF_BUILD_QML_PLUGINS=ON --install-prefix `pwd`/build/install
cd build
cmake --build . -j8
# to install
cmake --install .
# to run
LD_LIBRARY_PATH=../lib:~/app/qt5/6.5.1/gcc_64/lib ./install/quickevent
LD_LIBRARY_PATH=../lib:~/app/qt5/6.6.1/gcc_64/lib ./install/quickevent
```
If you want to use system Qt for build, then remove CLI option `-DCMAKE_PREFIX_PATH:PATH=/home/fanda/app/qt5/6.5.1/gcc_64`
If you want to use system Qt for build, then remove CLI option `-DCMAKE_PREFIX_PATH:PATH=/home/fanda/app/qt5/6.6.1/gcc_64`

## Install
#### Windows
Expand Down
13 changes: 13 additions & 0 deletions quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,21 @@ void RunsWidget::settleDownInPartWidget(quickevent::gui::PartWidget *part_widget
auto *a = new qfw::Action(tr("&Competitors with rented cards"));
connect(a, &qfw::Action::triggered, [this]() {
qff::MainWindow *fwk = qff::MainWindow::frameWork();
quickevent::gui::ReportOptionsDialog dlg(fwk);
dlg.setPersistentSettingsId("competitorsWithRentedCards");
dlg.loadPersistentSettings();
dlg.setClassFilterVisible(false);
dlg.setStartListOptionsVisible(false);
dlg.setStartListPrintVacantsVisible(false);
dlg.setPageLayoutVisible(true);
dlg.setStartTimeFormatVisible(false);
dlg.setStartlistOrderFirstByVisible(false);
if(!dlg.exec())
return;
auto opts = dlg.optionsMap();
QVariantMap props;
props["stageId"] = selectedStageId();
props["options"] = opts;
qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk
, getPlugin<RunsPlugin>()->findReportFile("competitorsWithCardRent.qml")
, QVariant()
Expand Down

0 comments on commit 65cdc82

Please sign in to comment.