Use simpler DEFINE for detecting Qt5 so moc will work too.

This commit is contained in:
sledgehammer999
2015-12-05 21:49:46 +02:00
parent 18a520c9f9
commit 9b1090332b
28 changed files with 71 additions and 70 deletions

View File

@@ -47,7 +47,7 @@
#include <QTemporaryFile>
#include <QMimeData>
#include <QClipboard>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#ifdef QBT_USES_QT5
#include <QTableView>
#endif
@@ -60,7 +60,7 @@ engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_en
{
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#ifdef QBT_USES_QT5
// This hack fixes reordering of first column with Qt5.
// https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777
QTableView unused;

View File

@@ -33,7 +33,7 @@
#include <QStandardItemModel>
#include <QHeaderView>
#include <QSortFilterProxyModel>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#ifdef QBT_USES_QT5
#include <QTableView>
#endif
@@ -48,7 +48,7 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget(), parent(parent)
box = new QVBoxLayout();
results_lbl = new QLabel();
resultsBrowser = new QTreeView();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#ifdef QBT_USES_QT5
// This hack fixes reordering of first column with Qt5.
// https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777
QTableView unused;