From 2833fdb90790dd0c25c9bb176fa373ff99ebfdff Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Fri, 29 Nov 2019 10:09:00 +0000
Subject: cmake: use appropriate compiler flags

---
 src/CMakeLists.txt | 4 ++--
 src/main/main.cpp  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c66a15c..6485cdc3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,8 +113,8 @@ target_compile_definitions(monero-gui
     ${Qt5Qml_DEFINITIONS}
 )
 
-set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-set(CMAKE_CXX_FLAGS "-std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 if(X11_FOUND)
     target_link_libraries(monero-gui ${X11_LIBRARIES} pthread dl Xt xcb X11)
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 138c2889..6b0a8744 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -92,7 +92,6 @@ Q_IMPORT_PLUGIN(QSvgIconPlugin)
 Q_IMPORT_PLUGIN(QGifPlugin)
 Q_IMPORT_PLUGIN(QICNSPlugin)
 Q_IMPORT_PLUGIN(QICOPlugin)
-Q_IMPORT_PLUGIN(QJp2Plugin)
 Q_IMPORT_PLUGIN(QJpegPlugin)
 Q_IMPORT_PLUGIN(QMngPlugin)
 Q_IMPORT_PLUGIN(QSvgPlugin)
-- 
cgit v1.2.3