49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 2436292..993df87 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
|
||
|
|
fi
|
||
|
|
])
|
||
|
|
|
||
|
|
-PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes,
|
||
|
|
+PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes,
|
||
|
|
AC_MSG_ERROR(Qt is required))
|
||
|
|
AC_SUBST(QT_CFLAGS)
|
||
|
|
AC_SUBST(QT_LIBS)
|
||
|
|
|
||
|
|
AC_MSG_CHECKING(for moc)
|
||
|
|
-MOC="`$PKG_CONFIG --variable=moc_location QtCore`"
|
||
|
|
+MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`"
|
||
|
|
AC_SUBST(MOC)
|
||
|
|
AC_MSG_RESULT($MOC)
|
||
|
|
|
||
|
|
AC_MSG_CHECKING(for uic)
|
||
|
|
-UIC="`$PKG_CONFIG --variable=uic_location QtCore`"
|
||
|
|
+UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`"
|
||
|
|
AC_SUBST(UIC)
|
||
|
|
AC_MSG_RESULT($UIC)
|
||
|
|
|
||
|
|
diff --git a/src/control.cpp b/src/control.cpp
|
||
|
|
index e1838a6..880da68 100644
|
||
|
|
--- a/src/control.cpp
|
||
|
|
+++ b/src/control.cpp
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
#include <qslider.h>
|
||
|
|
#include <qcheckbox.h>
|
||
|
|
#include <qcombobox.h>
|
||
|
|
-#include <QtGui/qmessagebox.h>
|
||
|
|
+#include <QMessageBox>
|
||
|
|
#include <qfiledialog.h>
|
||
|
|
#include <Qt>
|
||
|
|
#include <qbuffer.h>
|
||
|
|
@@ -31,7 +31,7 @@
|
||
|
|
#include <QFileInfo>
|
||
|
|
#include <QFile>
|
||
|
|
#include <QDir>
|
||
|
|
-#include <QtGui/QHeaderView>
|
||
|
|
+#include <QHeaderView>
|
||
|
|
|
||
|
|
#define TWO_BYTE_MAX 65535
|
||
|
|
#define FOUR_CHAR 4
|