commit b304e6d6fdcebe23a2eeb345e7f4f22d32601086 parent 17ce2819687ad35a9f51894dfffbfb8152550d9d Author: Christoph Lohmann <20h@r-36.net> Date: Tue, 20 Dec 2016 21:28:31 +0100 Porting limestone to Qt5. Diffstat:
| config.mk | | | 15 | ++++++++------- |
| limestone.cpp | | | 4 | ++-- |
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/config.mk b/config.mk @@ -8,16 +8,17 @@ PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man # includes and libs -INCS = -I. -I/usr/include -I/usr/share/qt4/mkspecs/linux-g++ \ - -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui \ - -I/usr/include/qt4 -LIBS = -L/usr/lib -L/usr/lib64 -L/usr/lib64/qt4 -L/usr/X11R6/lib \ - -lQtCore -lQtGui -lmarblewidget -lgthread-2.0 -lglib-2.0 \ - -lpthread -lstdc++ +INCS = -I. -I/usr/include -I/usr/include/qt5 \ + -I/usr/include/qt5/QtWidgets \ + -I/usr/include/qt5/QtCore \ + -I/usr/include/qt5/QtGui +LIBS = -L/usr/lib -L/usr/lib64 \ + -lmarblewidget-qt5 -lQt5Core -lQt5Gui -lQt5Widgets \ + -lstdc++ # flags CPPFLAGS = -DVERSION=\"${VERSION}\" -DQT_NO_DEBUG -DQT_GUI_LIB \ -DQT_CORE_LIB -DQT_SHARED -CFLAGS += -g -O2 -pipe -Wall ${INCS} ${CPPFLAGS} +CFLAGS += -g -O2 -pipe -fPIC -Wall ${INCS} ${CPPFLAGS} LDFLAGS += -g ${LIBS} # compiler and linker diff --git a/limestone.cpp b/limestone.cpp @@ -3,9 +3,9 @@ * by 20h */ -#include <QtGui/QApplication> +#include <QApplication> #include <QUrl> -#include <QtCore/QFileInfo> +#include <QFileInfo> #include <marble/MarbleWidget.h> #include <marble/MarbleModel.h>