Nicolas Winkler преди 5 години
родител
ревизия
d12ba67d54
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      libmandel/CMakeLists.txt
  2. 2 2
      main.cpp

+ 1 - 1
libmandel/CMakeLists.txt

@@ -84,10 +84,10 @@ endif(WITH_ASMJIT)
 
 if(OPENCL_FOUND)
     target_compile_definitions(mandel PUBLIC WITH_OPENCL)
-    target_include_directories(mandel PUBLIC "include")
     target_include_directories(mandel SYSTEM PUBLIC
         ${OpenCL_INCLUDE_DIRS}
     )
+    target_include_directories(mandel PUBLIC "include")
     link_directories(${OpenCL_LIBRARY})
 else(OPENCL_FOUND)
     include_directories("include")

+ 2 - 2
main.cpp

@@ -1,7 +1,7 @@
 #include "Almond.h"
 #include <QtWidgets/QApplication>
 #include <QPixmap>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <QSplashScreen>
 //#include <QTimer>
 #include <cmath>
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
-    QRect screenDim = a.desktop()->screenGeometry();
+    QSize screenDim = QGuiApplication::screens()[0]->size();
     int splashW = screenDim.width() * 2 / 11;
 
     QPixmap splashImg(":/splash/splash");