diff options
| author |   Renaud Guezennec <renaud@rolisteam.org> | 2020-03-28 01:08:11 +0000 |
|---|---|---|
| committer | Renaud Guezennec <renaud@rolisteam.org> | 2020-03-28 01:08:11 +0000 |
| commit | 944072519b4e7bc31e93024ece61b1079f7427a5 (patch) | |
| tree | 522475f7c4d5dade1c0b3482ab35d3f625b99ebe /result | |
| parent | 932d863c2a2c9b08d8ce1f4e1041e5795daedc6d (diff) | |
| parent | 088b2fa45dc2c763187109ec7d77f9eb096e498e (diff) | |
| download | OneRoll-944072519b4e7bc31e93024ece61b1079f7427a5.tar.gz OneRoll-944072519b4e7bc31e93024ece61b1079f7427a5.zip | |
Merge branch 'repeat2' into 'master'
All new features
See merge request kde/rolisteam-diceparser!4
Diffstat (limited to 'result')
| -rw-r--r-- | result/diceresult.cpp | 2 | ||||
| -rw-r--r-- | result/diceresult.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/result/diceresult.cpp b/result/diceresult.cpp index 23b925e..083c683 100644 --- a/result/diceresult.cpp +++ b/result/diceresult.cpp @@ -73,7 +73,7 @@ QVariant DiceResult::getResult(Dice::RESULT_TYPE type) } case Dice::RESULT_TYPE::DICE_LIST: { - return QVariant(); + return QVariant::fromValue(m_diceValues); } default: break; diff --git a/result/diceresult.h b/result/diceresult.h index ce8ffb7..8f30340 100644 --- a/result/diceresult.h +++ b/result/diceresult.h @@ -92,5 +92,5 @@ private: bool m_homogeneous; Die::ArithmeticOperator m_operator; }; - +Q_DECLARE_METATYPE(QList<Die*>) #endif // DICERESULT_H |