Qt5 compatibility

This commit squashes all the changes in the Qt5 branch
relative to master.

Backward compatibility with Qt4 is retained.

Original authors:

- Philip Kaufmann <phil.kaufmann@t-online.de>
- Jonas Schnelli <jonas.schnelli@include7.ch>
This commit is contained in:
Wladimir J. van der Laan
2013-05-31 14:02:24 +02:00
parent 365ab225c0
commit 25c0cce7fb
17 changed files with 90 additions and 14 deletions

View File

@@ -7,7 +7,9 @@
#include "optionsmodel.h"
#include <QPixmap>
#if QT_VERSION < 0x050000
#include <QUrl>
#endif
#include <qrencode.h>