Santiago Vila wrote... > /<<BUILDDIR>>/qlandkartegt-1.8.1+ds/3rdparty/map2gcm/main.cpp:43:46: error: > unable to find string literal operator 'operator""_MKSTR' with 'const char > [20]', 'long unsigned int' arguments > #define VER_STR > _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) > ^~~~~~~~~
That was easy to catch, earlier compiler versions gave according
warnings. But there is more, it seems (wild guess) the Qt header were
re-organized or there is another reason why several modules fail to
build with "error: invalid use of incomplete type 'class XXX'". Fix was
done by wild-guessing.
The result however is not usable - qlandkartegt stalls at the splash
screen, waiting for some data.
This is the point where somebody with Qt programming experience should
take over. Or I'll try to continue, but not today. Patches are attached.
Christoph, who'd like to have a usable qlandkartegt in Debian - how is
QMapShack supposed to be a replacement?
--- a/3rdparty/cache2gtiff/main.cpp +++ b/3rdparty/cache2gtiff/main.cpp @@ -35,7 +35,7 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) #define WHAT_STR "cache2gtiff, Version " VER_STR --- a/3rdparty/map2gcm/main.cpp +++ b/3rdparty/map2gcm/main.cpp @@ -40,7 +40,7 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) #define WHAT_STR "map2gcm, Version " VER_STR #define MAX_TILE_SIZE 1024 --- a/3rdparty/map2jnx/main.cpp +++ b/3rdparty/map2jnx/main.cpp @@ -51,7 +51,7 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) #define WHAT_STR "map2jnx, Version " VER_STR #define JNX_MAX_TILES 50000 //6250 --- a/3rdparty/map2rmap/main.cpp +++ b/3rdparty/map2rmap/main.cpp @@ -33,7 +33,7 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) #define WHAT_STR "map2rmap, Version " VER_STR --- a/3rdparty/map2rmp/CFileGenerator.cpp +++ b/3rdparty/map2rmp/CFileGenerator.cpp @@ -27,7 +27,7 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) extern "C" --- a/3rdparty/map2rmp/main.cpp +++ b/3rdparty/map2rmp/main.cpp @@ -32,7 +32,7 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) #define WHAT_STR "map2rmp, Version " VER_STR int main(int argc, char ** argv) --- a/src/version.h +++ b/src/version.h @@ -23,6 +23,6 @@ #define _MKSTR(x) _MKSTR_1(x) #endif -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) #define WHAT_STR "QLandkarte GT, Version " VER_STR #endif //VERSION_H
--- a/src/CDlgProxy.cpp +++ b/src/CDlgProxy.cpp @@ -21,6 +21,7 @@ #include "CMainWindow.h" #include <QtGui> +#include <QStyle> CDlgProxy::CDlgProxy(QString &user, QString &pwd, QWidget *parent) : QDialog(parent) --- a/src/CDiaryEdit.cpp +++ b/src/CDiaryEdit.cpp @@ -34,6 +34,7 @@ #include "CSettings.h" #include <QtGui> +#include <QAction> #include <QMessageBox> #include <QColorDialog> #include <QPrintDialog> --- a/src/CTextEditWidget.cpp +++ b/src/CTextEditWidget.cpp @@ -56,6 +56,7 @@ #include "CCanvas.h" #include <QtGui> +#include <QAction> #include <QColorDialog> CTextEditWidget::CTextEditWidget(QWidget * parent) --- a/src/CLiveLogToolWidget.cpp +++ b/src/CLiveLogToolWidget.cpp @@ -20,6 +20,7 @@ #include "CLiveLogDB.h" #include <QtGui> +#include <QTabWidget> CLiveLogToolWidget::CLiveLogToolWidget(QTabWidget * parent) :QWidget(parent)
signature.asc
Description: PGP signature
