Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SDK
Kompare
Commits
1f28a233
Commit
1f28a233
authored
Aug 04, 2022
by
Laurent Montel
Browse files
Fix some qt6 compile error
parent
82c04b4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/app/kompareurldialog.cpp
View file @
1f28a233
...
...
@@ -98,7 +98,7 @@ void KompareURLDialog::accept()
if
(
QFileInfo
(
m_diffPage
->
m_excludeFileURLComboBox
->
currentText
()).
isDir
())
{
qCDebug
(
KOMPARESHELL
)
<<
"Don't enter directory names where filenames are expected..."
;
KMessageBox
::
sorry
(
this
,
i18n
(
"File used for excluding files cannot be found, please specify another file."
));
KMessageBox
::
error
(
this
,
i18n
(
"File used for excluding files cannot be found, please specify another file."
));
reject
();
return
;
}
...
...
src/app/main.cpp
View file @
1f28a233
...
...
@@ -41,8 +41,9 @@
*/
int
main
(
int
argc
,
char
*
argv
[])
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QApplication
::
setAttribute
(
Qt
::
AA_UseHighDpiPixmaps
,
true
);
#endif
QApplication
app
(
argc
,
argv
);
KLocalizedString
::
setApplicationDomain
(
"kompare"
);
...
...
src/dialogpages/diffpage.h
View file @
1f28a233
...
...
@@ -10,13 +10,13 @@
#define DIFFPAGE_H
#include
<QFrame>
#include
<QStringList>
#include
"dialogpages_export.h"
class
QCheckBox
;
class
QDialog
;
class
QSpinBox
;
class
QStringList
;
class
QButtonGroup
;
class
QGroupBox
;
class
QTabWidget
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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