mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-07-08 05:48:45 +00:00
GH-2291 Fix build with Qt 5.11+
This commit is contained in:
Sergey Shatunov
parent
f0ff2db4e1
commit
4d68c1b509
|
|
@ -21,8 +21,7 @@ set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBI
|
|||
generate_export_header(MultiMC_gui)
|
||||
|
||||
# Link
|
||||
target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic)
|
||||
qt5_use_modules(MultiMC_gui Gui)
|
||||
target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic Qt5::Gui)
|
||||
|
||||
# Mark and export headers
|
||||
target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
|
|
|||
|
|
@ -476,7 +476,7 @@ generate_export_header(MultiMC_logic)
|
|||
|
||||
# Link
|
||||
target_link_libraries(MultiMC_logic xz-embedded MultiMC_unpack200 systeminfo MultiMC_quazip MultiMC_classparser ${NBT_NAME} ${ZLIB_LIBRARIES})
|
||||
qt5_use_modules(MultiMC_logic Core Xml Network Concurrent)
|
||||
target_link_libraries(MultiMC_logic Qt5::Core Qt5::Xml Qt5::Network Qt5::Concurrent)
|
||||
|
||||
# Mark and export headers
|
||||
target_include_directories(MultiMC_logic PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${ZLIB_INCLUDE_DIRS}")
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include "ui_NotificationDialog.h"
|
||||
|
||||
#include <QTimerEvent>
|
||||
#include <QStyle>
|
||||
|
||||
NotificationDialog::NotificationDialog(const NotificationChecker::NotificationEntry &entry, QWidget *parent) :
|
||||
QDialog(parent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::CustomizeWindowHint),
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include <QMessageBox>
|
||||
#include <QFileDialog>
|
||||
#include <QStandardPaths>
|
||||
#include <QTabBar>
|
||||
|
||||
#include "settings/SettingsObject.h"
|
||||
#include "tools/BaseProfiler.h"
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
#include <QDir>
|
||||
#include <QTabBar>
|
||||
|
||||
#include "dialogs/VersionSelectDialog.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include <QMessageBox>
|
||||
#include <QDir>
|
||||
#include <QTabBar>
|
||||
|
||||
#include "settings/SettingsObject.h"
|
||||
#include "MultiMC.h"
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include <QMessageBox>
|
||||
#include <QFileDialog>
|
||||
#include <QStandardPaths>
|
||||
#include <QTabBar>
|
||||
|
||||
#include "settings/SettingsObject.h"
|
||||
#include "tools/BaseProfiler.h"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
#include "ProxyPage.h"
|
||||
#include "ui_ProxyPage.h"
|
||||
|
||||
#include <QTabBar>
|
||||
|
||||
#include "settings/SettingsObject.h"
|
||||
#include "MultiMC.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "NotesPage.h"
|
||||
#include "ui_NotesPage.h"
|
||||
#include <QTabBar>
|
||||
|
||||
NotesPage::NotesPage(BaseInstance *inst, QWidget *parent)
|
||||
: QWidget(parent), ui(new Ui::NotesPage), m_inst(inst)
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
#include "dialogs/ProgressDialog.h"
|
||||
#include "dialogs/NewInstanceDialog.h"
|
||||
#include <QFileDialog>
|
||||
#include <QValidator>
|
||||
#include <InstanceImportTask.h>
|
||||
|
||||
class UrlValidator : public QValidator
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include <Filter.h>
|
||||
#include <Env.h>
|
||||
#include <InstanceCreationTask.h>
|
||||
#include <QTabBar>
|
||||
|
||||
VanillaPage::VanillaPage(NewInstanceDialog *dialog, QWidget *parent)
|
||||
: QWidget(parent), dialog(dialog), ui(new Ui::VanillaPage)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ message(${TEST_RESOURCE_PATH})
|
|||
function(add_unit_test name)
|
||||
set(options "")
|
||||
set(oneValueArgs DATA)
|
||||
set(multiValueArgs SOURCES LIBS QT)
|
||||
set(multiValueArgs SOURCES LIBS)
|
||||
|
||||
cmake_parse_arguments(OPT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
|
||||
|
||||
|
|
@ -40,8 +40,7 @@ function(add_unit_test name)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
target_link_libraries(${name}_test ${OPT_LIBS})
|
||||
qt5_use_modules(${name}_test Test ${OPT_QT})
|
||||
target_link_libraries(${name}_test Qt5::Test ${OPT_LIBS})
|
||||
|
||||
target_include_directories(${name}_test PRIVATE "${TEST_RESOURCE_PATH}/UnitTest/")
|
||||
|
||||
|
|
|
|||
|
|
@ -26,4 +26,4 @@ endif()
|
|||
add_library(LocalPeer STATIC ${SINGLE_SOURCES})
|
||||
target_include_directories(LocalPeer PUBLIC include)
|
||||
|
||||
qt5_use_modules(LocalPeer Core Network)
|
||||
target_link_libraries(LocalPeer Qt5::Core Qt5::Network)
|
||||
|
|
|
|||
|
|
@ -38,5 +38,4 @@ add_definitions(-DCLASSPARSER_LIBRARY)
|
|||
|
||||
add_library(MultiMC_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
|
||||
target_include_directories(MultiMC_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
||||
target_link_libraries(MultiMC_classparser MultiMC_quazip)
|
||||
qt5_use_modules(MultiMC_classparser Core)
|
||||
target_link_libraries(MultiMC_classparser MultiMC_quazip Qt5::Core)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ include/ganalytics.h
|
|||
)
|
||||
|
||||
add_library(ganalytics STATIC ${ganalytics_SOURCES})
|
||||
qt5_use_modules(ganalytics Core Gui Network)
|
||||
target_link_libraries(ganalytics Qt5::Core Qt5::Gui Qt5::Network)
|
||||
target_include_directories(ganalytics PUBLIC include)
|
||||
target_link_libraries(ganalytics systeminfo)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ internal/qiconloader_p.h
|
|||
add_library(MultiMC_iconfix SHARED ${ICONFIX_SOURCES})
|
||||
target_include_directories(MultiMC_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" )
|
||||
|
||||
qt5_use_modules(MultiMC_iconfix Core Widgets)
|
||||
target_link_libraries(MultiMC_iconfix Qt5::Core Qt5::Widgets)
|
||||
|
||||
set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
|
||||
generate_export_header(MultiMC_iconfix)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 683e2ec8ada758d6e48d31ec606840802e6941b7
|
||||
Subproject commit 469b97b618314ec009a37cad22e9d2541d6481f7
|
||||
|
|
@ -12,7 +12,7 @@ add_definitions(-DRAINBOW_LIBRARY)
|
|||
add_library(MultiMC_rainbow SHARED ${RAINBOW_SOURCES})
|
||||
target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
||||
|
||||
qt5_use_modules(MultiMC_rainbow Core Gui)
|
||||
target_link_libraries(MultiMC_rainbow Qt5::Core Qt5::Gui)
|
||||
|
||||
# Install it
|
||||
install(
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ elseif (UNIX)
|
|||
endif()
|
||||
|
||||
add_library(systeminfo STATIC ${systeminfo_SOURCES})
|
||||
qt5_use_modules(systeminfo Core Gui Network)
|
||||
target_link_libraries(systeminfo Qt5::Core Qt5::Gui Qt5::Network)
|
||||
target_include_directories(systeminfo PUBLIC include)
|
||||
|
||||
include (UnitTest)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user