Move to Qt5 and Qt5Multimedia

2016-03-10 07:12:44 +01:00
parent d7a9710a9c
commit aec2170e7e
98 changed files with 355 additions and 438 deletions
@@ -6,6 +6,7 @@ set(qcustomplot_HDRS
  qcustomplot.h
 )

-qt4_wrap_cpp(qcustomplot_SRCS ${qcustomplot_HDRS})
+qt5_wrap_cpp(qcustomplot_SRCS ${qcustomplot_HDRS})

 add_library(qcustomplot ${qcustomplot_SRCS})
+qt5_use_modules(qcustomplot Widgets PrintSupport)
@@ -45,14 +45,8 @@
 #include <QMargins>
 #include <qmath.h>
 #include <limits>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#  include <qnumeric.h>
-#  include <QPrinter>
-#  include <QPrintEngine>
-#else
-#  include <QtNumeric>
-#  include <QtPrintSupport>
-#endif
+#include <QtNumeric>
+#include <QtPrintSupport>

 class QCPPainter;
 class QCustomPlot;