Fix conflict again

launcher/CMakeLists.txt

@@ -918,8 +918,10 @@ endif()
 if(DEFINED MultiMC_BINARY_RPATH)
     SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}")
 endif()
+
 if(DEFINED MultiMC_APP_BINARY_DEFS)
     target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS})
+    target_compile_definitions(MultiMC_logic PRIVATE ${MultiMC_APP_BINARY_DEFS})
 endif()
 
 install(TARGETS MultiMC

launcher/minecraft/auth/AuthSession.h

@@ -4,8 +4,6 @@
 #include <QMultiMap>
 #include <memory>
 
-#include "logic_export.h"
-
 class MojangAccount;
 
 struct User

launcher/minecraft/auth/MojangAccountList.h

@@ -7,6 +7,15 @@
 #include <QAbstractListModel>
 #include <QSharedPointer>
 
+/*!
+ * \brief List of available Mojang accounts.
+ * This should be loaded in the background by MultiMC on startup.
+ *
+ * This class also inherits from QAbstractListModel. Methods from that
+ * class determine how this list shows up in a list view. Said methods
+ * all have a default implementation, but they can be overridden by subclasses to
+ * change the behavior of the list.
+ */
 class MojangAccountList : public QAbstractListModel
 {
     Q_OBJECT