Port to Qt 5.11

Add missing includes
Replace qt5_use_modules with target_link_libraries
This commit is contained in:
Joao Carreira 2018-06-15 01:51:26 +01:00
parent 773a0081e3
commit 71926a2761
3 changed files with 4 additions and 2 deletions

View File

@ -22,13 +22,12 @@ add_executable (barrier WIN32
include_directories (./src)
qt5_use_modules (barrier Core Widgets Network)
target_compile_definitions (barrier PRIVATE -DBARRIER_VERSION_STAGE="${BARRIER_VERSION_STAGE}")
target_compile_definitions (barrier PRIVATE -DBARRIER_REVISION="${BARRIER_REVISION}")
if (WIN32)
include_directories ($ENV{BONJOUR_SDK_HOME}/Include)
find_library (DNSSD_LIB dnssd.lib
find_library (DNSSD_LIB dnssd.lib
HINTS ENV BONJOUR_SDK_HOME
PATH_SUFFIXES "Lib/x64")
set_target_properties (barrier PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
@ -46,6 +45,7 @@ if (HAVE_X11)
endif()
target_link_libraries (barrier common)
target_link_libraries (barrier Qt5::Core Qt5::Widgets Qt5::Network)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
install (TARGETS barrier DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})

View File

@ -25,6 +25,7 @@
#include <QtCore>
#include <QtGui>
#include <QButtonGroup>
ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),

View File

@ -22,6 +22,7 @@
#include <QtCore>
#include <QtGui>
#include <QHeaderView>
ScreenSetupView::ScreenSetupView(QWidget* parent) :
QTableView(parent)