mirror of
https://github.com/fralx/LimeReport.git
synced 2025-04-05 08:53:52 +03:00
fixing conflicts
This commit is contained in:
parent
17e729b09c
commit
a860897b88
@ -159,6 +159,7 @@ equals(QT_MAJOR_VERSION, 4) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6) {
|
equals(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 6) {
|
||||||
DEFINES *= HAVE_QT5
|
DEFINES *= HAVE_QT5
|
||||||
QT *= printsupport widgets
|
QT *= printsupport widgets
|
||||||
|
Loading…
Reference in New Issue
Block a user