Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KSSHAskPass
Commits
1412c4ab
Commit
1412c4ab
authored
Jan 16, 2022
by
Laurent Montel
😁
Browse files
Adapt build system for building against qt6 (still missing porting
winId)
parent
61de2a9d
Pipeline
#124199
passed with stage
in 33 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
1412c4ab
...
...
@@ -3,11 +3,8 @@ cmake_minimum_required(VERSION 3.16)
set
(
PROJECT_VERSION
"5.24.80"
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.
86
"
)
set
(
KF5_MIN_VERSION
"5.
90
"
)
set
(
KDE_COMPILERSETTINGS_LEVEL
"5.82"
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED COMPONENTS Core
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
...
...
@@ -19,6 +16,9 @@ include(ECMQtDeclareLoggingCategory)
include
(
KDEClangFormat
)
include
(
KDEGitCommitHooks
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED COMPONENTS Core
)
add_definitions
(
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
)
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS
...
...
src/main.cpp
View file @
1412c4ab
...
...
@@ -237,8 +237,9 @@ static void parsePrompt(const QString &prompt, QString &identifier, bool &ignore
int
main
(
int
argc
,
char
**
argv
)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QGuiApplication
::
setAttribute
(
Qt
::
AA_UseHighDpiPixmaps
,
true
);
#endif
QApplication
app
(
argc
,
argv
);
KLocalizedString
::
setApplicationDomain
(
"ksshaskpass"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment