Qt5

README.md

@@ -158,7 +158,6 @@ The following flags (with their non-default values) can be passed to `cmake`:
 | `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode |
 | `-DUPDATE_TRANSLATIONS=1` |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
 | `-DTEST=1` | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available |
-| `-DFORCE_USE_QT5=1` | Skip looking for Qt6 before trying to find Qt5 |
 
 
 # Run

cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp

@@ -42,11 +42,6 @@ QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *o
     if (element != SE_TabBarTabText) {
         return QProxyStyle::subElementRect(element, option, widget);
     }
-
-    // Skip over QProxyStyle handling subElementRect,
-    // This fixes an issue with Qt 5.10 on OSX where the labels for tabs with a button and an icon
-    // get cut-off too early
-    return QCommonStyle::subElementRect(element, option, widget);
 }
 
 CloseButton::CloseButton(QWidget *parent) : QAbstractButton(parent)
@@ -108,12 +103,6 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
     setMovable(true);
     setIconSize(QSize(15, 15));
 
-#if defined(Q_OS_MAC)
-    // This is necessary to fix an issue on macOS with qt5.10,
-    // where tabs with icons and buttons get drawn incorrectly
-    tabBar()->setStyle(new MacOSTabFixStyle);
-#endif
-
     userListManager = new UserListManager(client, this);
 
     // connect tab changes