mirror of
https://github.com/YACReader/yacreader
synced 2026-03-02 10:50:04 -05:00
Drop Qt 5 support
This commit is contained in:
@ -41,18 +41,15 @@ macx {
|
||||
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
|
||||
CONFIG += objective_c
|
||||
QT += gui-private
|
||||
lessThan(QT_MAJOR_VERSION, 6): QT += macextras
|
||||
}
|
||||
|
||||
#CONFIG += release
|
||||
CONFIG -= flat
|
||||
QT += sql network widgets svg quickcontrols2
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
|
||||
QT += core5compat
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 6) {
|
||||
QT += gui-private
|
||||
}
|
||||
greaterThan(QT_MINOR_VERSION, 6): QT += gui-private
|
||||
|
||||
# Input
|
||||
HEADERS += \
|
||||
|
||||
@ -146,22 +146,14 @@ void ComicVineDialog::goNext()
|
||||
QList<QPair<ComicDB, QString>> matchingInfo = sortVolumeComicsWidget->getMatchingInfo();
|
||||
auto volumeInfo = selectVolumeWidget->getSelectedVolumeInfo();
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QtConcurrent::run(&ComicVineDialog::getComicsInfo, this, matchingInfo, volumeInfo);
|
||||
#else
|
||||
QtConcurrent::run(this, &ComicVineDialog::getComicsInfo, matchingInfo, volumeInfo);
|
||||
#endif
|
||||
|
||||
} else if (content->currentWidget() == selectComicWidget) {
|
||||
showLoading();
|
||||
QString comicId = selectComicWidget->getSelectedComicId();
|
||||
auto volumeInfo = selectVolumeWidget->getSelectedVolumeInfo();
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QtConcurrent::run(&ComicVineDialog::getComicInfo, this, comicId, volumeInfo);
|
||||
#else
|
||||
QtConcurrent::run(this, &ComicVineDialog::getComicInfo, comicId, volumeInfo);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -6,25 +6,13 @@ ScraperTableView::ScraperTableView(QWidget *parent)
|
||||
: QTableView(parent)
|
||||
{
|
||||
setShowGrid(false);
|
||||
#if QT_VERSION >= 0x050000
|
||||
verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
|
||||
#else
|
||||
verticalHeader()->setResizeMode(QHeaderView::Fixed);
|
||||
#endif
|
||||
|
||||
horizontalHeader()->setStretchLastSection(true);
|
||||
#if QT_VERSION >= 0x050000
|
||||
horizontalHeader()->setSectionsClickable(false);
|
||||
#else
|
||||
horizontalHeader()->setClickable(false);
|
||||
#endif
|
||||
// comicView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
|
||||
verticalHeader()->setDefaultSectionSize(24);
|
||||
#if QT_VERSION >= 0x050000
|
||||
verticalHeader()->setSectionsClickable(false); // TODO comportamiento anómalo
|
||||
#else
|
||||
verticalHeader()->setClickable(false); // TODO comportamiento anómalo
|
||||
#endif
|
||||
|
||||
setCornerButtonEnabled(false);
|
||||
|
||||
|
||||
@ -41,12 +41,7 @@ void InitialComicInfoExtractor::extract()
|
||||
return;
|
||||
}
|
||||
#else
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
auto pdfComic = Poppler::Document::load(_fileSource);
|
||||
#else
|
||||
auto _pdfComic = Poppler::Document::load(_fileSource);
|
||||
auto pdfComic = std::unique_ptr<Poppler::Document>(_pdfComic);
|
||||
#endif
|
||||
#endif
|
||||
if (!pdfComic) {
|
||||
QLOG_WARN() << "Extracting cover: unable to open PDF file " << _fileSource;
|
||||
|
||||
@ -169,13 +169,11 @@ bool LibraryWindow::eventFilter(QObject *object, QEvent *event)
|
||||
return QMainWindow::eventFilter(object, event);
|
||||
}
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
auto keyCombination = keySequence[0];
|
||||
|
||||
if (keyCombination.keyboardModifiers() != Qt::NoModifier) {
|
||||
return QMainWindow::eventFilter(object, event);
|
||||
}
|
||||
#endif
|
||||
|
||||
auto string = keySequence.toString();
|
||||
|
||||
@ -774,11 +772,7 @@ void LibraryWindow::createConnections()
|
||||
|
||||
// Search filter
|
||||
#ifdef Y_MAC_UI
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
connect(libraryToolBar, &YACReaderMacOSXToolbar::filterChanged, searchDebouncer, &KDToolBox::KDStringSignalDebouncer::throttle);
|
||||
#else
|
||||
connect(searchEdit, &YACReaderMacOSXSearchLineEdit::filterChanged, searchDebouncer, &KDToolBox::KDStringSignalDebouncer::throttle);
|
||||
#endif
|
||||
connect(searchDebouncer, &KDToolBox::KDStringSignalDebouncer::triggered, this, [=](QString filter) {
|
||||
setSearchFilter(filter);
|
||||
});
|
||||
|
||||
@ -131,9 +131,7 @@ int main(int argc, char **argv)
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QImageReader::setAllocationLimit(0);
|
||||
#endif
|
||||
|
||||
QApplication app(argc, argv);
|
||||
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
|
||||
#include <QtGlobal>
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
#undef __OBJC_BOOL_IS_BOOL
|
||||
#endif
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#include "trayhandler.h"
|
||||
|
||||
Reference in New Issue
Block a user