From: warwick Date: Mon, 21 Jan 2002 05:17:40 +0000 (+0000) Subject: Qt compatibility fixes X-Git-Tag: MOVE2GIT~3405 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75305dc3b38c7d0e4ee2b8fffd8a95b4a75aa788;p=nethack Qt compatibility fixes Fixes for Qt version 2.0 (old). --- diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index 5d1660a9f..f739c9416 100644 --- a/win/Qt/qt_win.cpp +++ b/win/Qt/qt_win.cpp @@ -3446,7 +3446,13 @@ public: const QString& grouptext, QObject * receiver, const char* slot, QToolBar * parent) : - QToolButton(pm, textLabel, grouptext, receiver, slot, parent) + QToolButton(pm, textLabel, +#if QT_VERSION < 210 + QString::null, +#else + grouptext, +#endif + receiver, slot, parent) { } @@ -3462,10 +3468,12 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) : message(0), map(0), status(0), invusage(0), keysink(ks) { - setToolBarsMovable(FALSE); QToolBar* toolbar = new QToolBar(this); +#if QT_VERSION >= 210 + setToolBarsMovable(FALSE); toolbar->setHorizontalStretchable(TRUE); toolbar->setVerticalStretchable(TRUE); +#endif addToolBar(toolbar); menubar = menuBar();