diff options
| author | John Fultz <jfultz@wolfram.com> | 2023-07-15 20:55:39 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2023-07-16 08:29:42 -0500 |
| commit | 07c06961b45eaf6ba0a53bcef8761798a5b55158 (patch) | |
| tree | 463b8df1ae05594bd820130aa47542ea25fe92d3 | |
| parent | 525f330420d6f3b112dbae36c2fb9769265321a8 (diff) | |
More Qt6-ish things that were probably a bad idea even in Qt5.
| -rw-r--r-- | quacker/geometry.cpp | 2 | ||||
| -rw-r--r-- | quacker/graphicalboard.cpp | 4 | ||||
| -rw-r--r-- | quacker/main.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/quacker/geometry.cpp b/quacker/geometry.cpp index 178df00..c4b3ba1 100644 --- a/quacker/geometry.cpp +++ b/quacker/geometry.cpp @@ -26,5 +26,5 @@ void Geometry::setupFramedLayout(QBoxLayout *layout) void Geometry::setupInnerLayout(QBoxLayout *layout) { - layout->setMargin(0); + layout->setContentsMargins(QMargins()); } diff --git a/quacker/graphicalboard.cpp b/quacker/graphicalboard.cpp index e6a2599..0fc3785 100644 --- a/quacker/graphicalboard.cpp +++ b/quacker/graphicalboard.cpp @@ -581,8 +581,8 @@ void GraphicalBoardFrame::keyPressEvent(QKeyEvent *event) case Append: if (event->text().isEmpty() || - (event->text().at(0) >= 0xa8 && event->text().at(0) <= 0xb8) || // combining character - (event->text().at(0) >= 0x2b9 && event->text().at(0) <= 0x2ff)) // combining character + (event->text().at(0) >= QChar(0xa8) && event->text().at(0) <= QChar(0xb8)) || // combining character + (event->text().at(0) >= QChar(0x2b9) && event->text().at(0) <= QChar(0x2ff))) // combining character break; // let AltGr (Ctrl+Alt) and other composite keyboard events slip through else if (event->modifiers() & Qt::AltModifier || event->modifiers() & Qt::ControlModifier) { diff --git a/quacker/main.cpp b/quacker/main.cpp index 57728af..6aa1368 100644 --- a/quacker/main.cpp +++ b/quacker/main.cpp @@ -61,7 +61,7 @@ private: int main(int argc, char **argv) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif QuackerApplication a(argc, argv); |