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
PIM
Akonadi Contacts
Commits
74d90110
Commit
74d90110
authored
Apr 18, 2017
by
Laurent Montel
😁
Browse files
GIT_SILENT: we depend against qt5.7 now. Clean up
parent
94311653
Changes
10
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
74d90110
...
...
@@ -35,7 +35,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADICONTACT
SOVERSION 5
)
set
(
QT_REQUIRED_VERSION
"5.
6
.0"
)
set
(
QT_REQUIRED_VERSION
"5.
7
.0"
)
find_package
(
Qt5
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets
)
########### Find packages ###########
find_package
(
KF5KIO
${
KF5_VERSION
}
CONFIG REQUIRED
)
...
...
src/contactgroupviewer.cpp
View file @
74d90110
...
...
@@ -24,7 +24,7 @@
#include "job/contactgroupexpandjob.h"
#include "standardcontactgroupformatter.h"
#include "textbrowser_p.h"
#include "helper_p.h"
#include <collectionfetchjob.h>
#include <entitydisplayattribute.h>
...
...
src/contactviewer.cpp
View file @
74d90110
...
...
@@ -26,7 +26,7 @@
#include "customfieldmanager_p.h"
#include "standardcontactformatter.h"
#include "textbrowser_p.h"
#include "helper_p.h"
#include "editor/im/improtocols.h"
#include <KIOCore/kio/transferjob.h>
#include <collection.h>
...
...
src/editor/addresseditor/webengine/addresseslocationenginepage.cpp
View file @
74d90110
...
...
@@ -38,13 +38,11 @@ AddressesLocationEnginePage::AddressesLocationEnginePage(QObject *parent)
settings
()
->
setAttribute
(
QWebEngineSettings
::
ErrorPageEnabled
,
false
);
settings
()
->
setAttribute
(
QWebEngineSettings
::
LocalContentCanAccessRemoteUrls
,
false
);
settings
()
->
setAttribute
(
QWebEngineSettings
::
LocalContentCanAccessFileUrls
,
false
);
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
settings
()
->
setAttribute
(
QWebEngineSettings
::
ScreenCaptureEnabled
,
false
);
settings
()
->
setAttribute
(
QWebEngineSettings
::
WebGLEnabled
,
false
);
settings
()
->
setAttribute
(
QWebEngineSettings
::
AutoLoadIconsForPage
,
false
);
settings
()
->
setAttribute
(
QWebEngineSettings
::
Accelerated2dCanvasEnabled
,
false
);
settings
()
->
setAttribute
(
QWebEngineSettings
::
WebGLEnabled
,
false
);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
settings
()
->
setAttribute
(
QWebEngineSettings
::
FocusOnNavigationEnabled
,
false
);
...
...
src/editor/contacteditorwidget.cpp
View file @
74d90110
...
...
@@ -25,7 +25,7 @@
#include "personaleditor/personaleditorwidget.h"
#include "contacteditorpageplugin.h"
#include "contactmetadata_p.h"
#include "helper_p.h"
#include <kconfig.h>
#include <kconfiggroup.h>
...
...
src/editor/customfieldeditor/customfieldslistwidget.cpp
View file @
74d90110
...
...
@@ -22,7 +22,7 @@
#include "customfieldslistwidget.h"
#include "../utils/utils.h"
#include "helper_p.h"
#include "customfieldmanager_p.h"
#include "customfieldslistdelegate.h"
#include <QSortFilterProxyModel>
...
...
src/editor/generalinfoeditor/displaynameeditwidget.cpp
View file @
74d90110
...
...
@@ -20,7 +20,7 @@
*/
#include "displaynameeditwidget.h"
#include "helper_p.h"
#include <QtCore/QEvent>
#include <QAbstractItemView>
...
...
src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp
View file @
74d90110
...
...
@@ -25,7 +25,7 @@
#include "../../im/imaddress.h"
#include "../../im/improtocols.h"
#include "../../utils/utils.h"
#include "helper_p.h"
#include <KContacts/Addressee>
using
namespace
Akonadi
;
...
...
src/editor/widgets/kwidgetlister.cpp
View file @
74d90110
...
...
@@ -31,7 +31,7 @@
*/
#include "kwidgetlister_p.h"
#include "helper_p.h"
#include <QHBoxLayout>
#include <QPushButton>
...
...
src/helper_p.h
deleted
100644 → 0
View file @
94311653
/*
Copyright (c) 2017 Laurent Montel <montel@kde.org>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef _HELPER_H
#define _HELPER_H
#include <qglobal.h>
#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
namespace
QtPrivate
{
template
<
typename
T
>
struct
QAddConst
{
typedef
const
T
Type
;
};
}
// this adds const to non-const objects (like std::as_const)
template
<
typename
T
>
Q_DECL_CONSTEXPR
typename
QtPrivate
::
QAddConst
<
T
>::
Type
&
qAsConst
(
T
&
t
)
Q_DECL_NOTHROW
{
return
t
;
}
// prevent rvalue arguments:
template
<
typename
T
>
void
qAsConst
(
const
T
&&
)
Q_DECL_EQ_DELETE
;
#endif
#endif
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