diff --git a/configure.ac b/configure.ac index 539ee20f..128c0f30 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_CHECK_HEADER([mxml.h], [], [AC_MSG_FAILURE([mxml.h is needed for ltr_gui comp AC_CHECK_LIB([crypto], [SHA1], [LIBCRYPTO=true], [AC_MSG_FAILURE([libcrypto not found!])]) # Qt is needed for the GUI -AC_PATH_PROGS(QMAKE_PATH, [qmake qmake-qt4]) +AC_PATH_PROGS(QMAKE_PATH, [qmake qmake-qt5 qmake5]) # used to decompress the TrackIR firmware, if necessary @@ -213,7 +213,7 @@ AS_IF([case $host_os in darwin*) true;; *) false;; esac], ] ) -m4_ifdef([PKG_CHECK_MODULES], [PKG_CHECK_MODULES([OPENCV], [opencv >= 2.0], [], [AC_MSG_RESULT([Opencl not present.])])]) +m4_ifdef([PKG_CHECK_MODULES], [PKG_CHECK_MODULES([OPENCV], [opencv4 >= 2.0], [], [AC_MSG_RESULT([Opencl not present.])])]) AC_SUBST([OPENCV_CFLAGS]) diff --git a/src/facetrack.cpp b/src/facetrack.cpp index 791f9d4e..06731a71 100644 --- a/src/facetrack.cpp +++ b/src/facetrack.cpp @@ -3,6 +3,7 @@ #include "facetrack.h" #include "wc_driver_prefs.h" +#include #include #include #include diff --git a/src/game_data.c b/src/game_data.c index 74bb00aa..ff170171 100644 --- a/src/game_data.c +++ b/src/game_data.c @@ -139,7 +139,9 @@ bool get_game_data(const char *input_fname, const char *output_fname, bool from_ if(appid == NULL){ fprintf(outfile, "%s \"%s\"\n", id, name); }else{ - fprintf(outfile, "%s \"%s\" (%s)\n", id, name, appid->child->value.text.string); + mxml_node_t *child = mxmlGetFirstChild(appid); + int whitespace; + fprintf(outfile, "%s \"%s\" (%s)\n", id, name, mxmlGetText(child, &whitespace)); } } fclose(outfile); diff --git a/src/mickey/my_line_edit.cpp b/src/mickey/my_line_edit.cpp index 862a331f..8c075e50 100644 --- a/src/mickey/my_line_edit.cpp +++ b/src/mickey/my_line_edit.cpp @@ -9,7 +9,7 @@ myLineEdit::myLineEdit(QWidget *parent) : QLineEdit(parent), tgt(NULL) void myLineEdit::keyPressEvent(QKeyEvent * event) { - QString seq = QString::null; + QString seq = QString(); Qt::KeyboardModifiers mods = event->modifiers(); if(mods & Qt::ShiftModifier){ seq += QString::fromUtf8("Shift+"); diff --git a/src/qt_gui/glwidget.cpp b/src/qt_gui/glwidget.cpp index 5e80b6bb..9856484b 100644 --- a/src/qt_gui/glwidget.cpp +++ b/src/qt_gui/glwidget.cpp @@ -2,7 +2,7 @@ #include "../../config.h" #endif -#include +#include #include #ifndef DARWIN #include diff --git a/src/qt_gui/precomp_headers.h b/src/qt_gui/precomp_headers.h index 1b875921..25cc9766 100644 --- a/src/qt_gui/precomp_headers.h +++ b/src/qt_gui/precomp_headers.h @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/qt_gui/window.cpp b/src/qt_gui/window.cpp index 485045f0..e0e2114a 100644 --- a/src/qt_gui/window.cpp +++ b/src/qt_gui/window.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "glwidget.h"