Skip to content

Update qt6 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sc74 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update qt6 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(Qt5 COMPONENTS Widgets Sql Xml DBus REQUIRED)
find_package(Qt6 COMPONENTS Core Core5Compat Widgets Sql Xml DBus REQUIRED)

set(SOURCES
main.cpp
Expand All @@ -22,15 +22,17 @@ set(SOURCES
handler.cpp
xmldriverslistreader.cpp)

qt5_add_resources(SOURCES resources/resources.qrc)
qt6_add_resources(SOURCES resources/resources.qrc)

add_executable(ekosdebugger ${SOURCES})

target_link_libraries(ekosdebugger PRIVATE
Qt5::Widgets
Qt5::Sql
Qt5::Xml
Qt5::DBus
Qt6::Widgets
Qt6::Sql
Qt6::Xml
Qt6::DBus
Qt6::Core5Compat
Qt6::Core
)

install(TARGETS ekosdebugger RUNTIME DESTINATION bin )
Expand Down
13 changes: 8 additions & 5 deletions debuggerview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
#include <QStandardItemModel>
#include <QXmlSimpleReader>
#include <QStandardPaths>
#include <QRegExp>
#include <QString>
#include <QTextStream>

#include "driverinfo.h"
#include "userdb.h"
Expand Down Expand Up @@ -585,8 +588,8 @@ void DebuggerView::saveKStarsLogs()
QStringList pieces = KStarsLogFilePath.split( "/" );
KStarsLogFolderName = pieces.value( pieces.length() - 2 );
KStarsLogFileName = pieces.value( pieces.length() - 1 );
QRegExp separator("[(_|.)]");
QStringList parts = KStarsLogFileName.split(separator);
// QRegExp separator("[(_|.)]");
QStringList parts = KStarsLogFileName.split(QRegularExpression("[(_|.)]"));
timestamp = KStarsLogFolderName + "T" + parts[1];
}
else
Expand Down Expand Up @@ -614,7 +617,7 @@ void DebuggerView::saveKStarsLogs()
if ( debugfile.open(QIODevice::ReadWrite) )
{
QTextStream stream( &debugfile );
stream << debugLog << endl;
stream << debugLog << Qt::endl;
}
debugfile.close();

Expand Down Expand Up @@ -715,7 +718,7 @@ void DebuggerView::saveINDILogs()
if ( debugfile.open(QIODevice::ReadWrite) )
{
QTextStream stream( &debugfile );
stream << debugLog << endl;
stream << debugLog << Qt::endl;
}
debugfile.close();

Expand All @@ -724,7 +727,7 @@ void DebuggerView::saveINDILogs()
if ( appfile.open(QIODevice::ReadWrite) )
{
QTextStream stream( &appfile );
stream << appLog << endl;
stream << appLog << Qt::endl;
}
appfile.close();

Expand Down
2 changes: 1 addition & 1 deletion ekosdebugger.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ BuildRequires: boost-regex

BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt6)

%description
Ekos Debugger is a helper application to KStars, Ekos, and INDI debugging. It can be used to troubleshoot KStars, INDI, or both.
Expand Down