Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
LabPlot
Commits
7e2b89ad
Commit
7e2b89ad
authored
Jul 12, 2020
by
Alexander Semke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[mac os] updated kdmactouchbar to a newer version to make the code compile with Qt 5.15.
parent
ee9c3466
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
src/3rdparty/kdmactouchbar/src/kdmactouchbar.h
src/3rdparty/kdmactouchbar/src/kdmactouchbar.h
+1
-1
src/3rdparty/kdmactouchbar/src/kdmactouchbar.mm
src/3rdparty/kdmactouchbar/src/kdmactouchbar.mm
+12
-1
src/3rdparty/kdmactouchbar/src/kdmactouchbar_global.h
src/3rdparty/kdmactouchbar/src/kdmactouchbar_global.h
+1
-1
No files found.
src/3rdparty/kdmactouchbar/src/kdmactouchbar.h
View file @
7e2b89ad
/****************************************************************************
** Copyright (C) 2019 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
** Copyright (C) 2019
-2020
Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
** All rights reserved.
**
** This file is part of the KD MacTouchBar library.
...
...
src/3rdparty/kdmactouchbar/src/kdmactouchbar.mm
View file @
7e2b89ad
/****************************************************************************
** Copyright (C) 2019 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
** Copyright (C) 2019
-2020
Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
** All rights reserved.
**
** This file is part of the KD MacTouchBar library.
...
...
@@ -37,7 +37,18 @@
QT_BEGIN_NAMESPACE
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
NSImage
*
qt_mac_create_nsimage
(
const
QIcon
&
icon
,
int
defaultSize
=
0
);
#else
// defined in gui/painting/qcoregraphics.mm
@interface
NSImage
(
QtExtras
)
+
(
instancetype
)
imageFromQIcon
:(
const
QIcon
&
)
icon
;
@end
static
NSImage
*
qt_mac_create_nsimage
(
const
QIcon
&
icon
)
{
return
[
NSImage
imageFromQIcon
:
icon
];
}
#endif
static
QString
identifierForAction
(
QObject
*
action
)
{
...
...
src/3rdparty/kdmactouchbar/src/kdmactouchbar_global.h
View file @
7e2b89ad
/****************************************************************************
** Copyright (C) 2019 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
** Copyright (C) 2019
-2020
Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
** All rights reserved.
**
** This file is part of the KD MacTouchBar library.
...
...
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