Skip to content

Migrate GUI to use qt5 libs #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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])
Expand Down
1 change: 1 addition & 0 deletions src/facetrack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "facetrack.h"
#include "wc_driver_prefs.h"

#include <opencv2/core/core_c.h>
#include <opencv2/core/core.hpp>
#include <opencv2/objdetect/objdetect.hpp>
#include <opencv2/imgproc/imgproc.hpp>
Expand Down
4 changes: 3 additions & 1 deletion src/game_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/mickey/my_line_edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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+");
Expand Down
2 changes: 1 addition & 1 deletion src/qt_gui/glwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "../../config.h"
#endif

#include <QtGui>
#include <QtWidgets>
#include <QtOpenGL>
#ifndef DARWIN
#include <GL/glu.h>
Expand Down
2 changes: 1 addition & 1 deletion src/qt_gui/precomp_headers.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#include <QTemporaryFile>
#include <QTextBrowser>
#include <QTextStream>
#include <QtGui>
#include <QtWidgets>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/qt_gui/window.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <QtGui>
#include <QtWidgets>
#include <QTabWidget>

#include "glwidget.h"
Expand Down