fix: build errors and add support for Qt6

This commit is contained in:
Joao Carreira committed 2023-03-28 01:07:32 +01:00
1 parent cbefa2be2e
commit acb04c2360
22 files changed
+13978 -14748

No files matched your search

+8 -4
View File
@@ -22,6 +22,10 @@
* \brief main file
*/
#include <QApplication>
#include <QMetaType>
#include <QStyleFactory>
#include "CommonDefs.h"
#include "ConfigureFormatDialog.h"
#include "MainWindow.h"
@@ -30,8 +34,7 @@
#ifdef USE_QTDBUS
#include "DBusAppAdaptor.h"
#endif
#include <QApplication>
#include <QStyleFactory>
#ifdef USE_FERVOR
#include "fvupdater.h"
#endif
@@ -43,10 +46,11 @@
int main( int argc, char* argv[] )
{
qRegisterMetaType<CalypFileInfoVector>();
qRegisterMetaTypeStreamOperators<CalypFileInfoVector>();
qRegisterMetaType<CalypStandardResolutionVector>();
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
qRegisterMetaTypeStreamOperators<CalypFileInfoVector>();
qRegisterMetaTypeStreamOperators<CalypStandardResolutionVector>();
#endif
QApplication application( argc, argv );
QApplication::setApplicationName( QStringLiteral( "Calyp" ) );
QApplication::setApplicationVersion( QStringLiteral( CALYP_VERSION_STRING ) );