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
Network
Konqueror
Commits
4603b92a
Commit
4603b92a
authored
Sep 17, 2020
by
Laurent Montel
😁
Browse files
Drop outdated QT_USE_FAST_OPERATOR_PLUS and use QT_USE_QSTRINGBUILDER
parent
62bd919d
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
4603b92a
...
@@ -50,7 +50,9 @@ if (X11_FOUND)
...
@@ -50,7 +50,9 @@ if (X11_FOUND)
find_package
(
Qt5 REQUIRED X11Extras
)
find_package
(
Qt5 REQUIRED X11Extras
)
endif
(
X11_FOUND
)
endif
(
X11_FOUND
)
add_definitions
(
-DQT_USE_FAST_OPERATOR_PLUS
)
add_definitions
(
-DQT_USE_QSTRINGBUILDER
)
add_definitions
(
-DQT_NO_URL_CAST_FROM_STRING
)
add_definitions
(
-DQT_NO_URL_CAST_FROM_STRING
)
include
(
CheckSymbolExists
)
include
(
CheckSymbolExists
)
...
...
autotests/konqviewmgrtest.cpp
View file @
4603b92a
...
@@ -600,7 +600,7 @@ static void openTabWithTitle(KonqMainWindow &mainWindow, const QString &title, K
...
@@ -600,7 +600,7 @@ static void openTabWithTitle(KonqMainWindow &mainWindow, const QString &title, K
// correct since it's a subclass of text/html, khtml can display it
// correct since it's a subclass of text/html, khtml can display it
QVERIFY
(
view
->
supportsMimeType
(
"application/x-netscape-bookmarks"
));
QVERIFY
(
view
->
supportsMimeType
(
"application/x-netscape-bookmarks"
));
// Tab caption test
// Tab caption test
view
->
openUrl
(
QUrl
(
"data:text/html, <title>"
+
title
.
toUtf8
()
+
"</title>"
),
QStringLiteral
(
"http://loc.bar.url"
));
view
->
openUrl
(
QUrl
(
QStringLiteral
(
"data:text/html, <title>"
)
+
title
+
QStringLiteral
(
"</title>"
)
)
,
QStringLiteral
(
"http://loc.bar.url"
));
QSignalSpy
spyCompleted
(
view
,
SIGNAL
(
viewCompleted
(
KonqView
*
)));
QSignalSpy
spyCompleted
(
view
,
SIGNAL
(
viewCompleted
(
KonqView
*
)));
QVERIFY
(
spyCompleted
.
wait
(
10000
));
QVERIFY
(
spyCompleted
.
wait
(
10000
));
QCOMPARE
(
view
->
caption
(),
title
);
QCOMPARE
(
view
->
caption
(),
title
);
...
...
src/konqmainwindow.cpp
View file @
4603b92a
...
@@ -4120,7 +4120,7 @@ void KonqMainWindow::connectExtension(KParts::BrowserExtension *ext)
...
@@ -4120,7 +4120,7 @@ void KonqMainWindow::connectExtension(KParts::BrowserExtension *ext)
//qCDebug(KONQUEROR_LOG) << it.key();
//qCDebug(KONQUEROR_LOG) << it.key();
if
(
act
)
{
if
(
act
)
{
// Does the extension have a slot with the name of this action ?
// Does the extension have a slot with the name of this action ?
if
(
ext
->
metaObject
()
->
indexOfSlot
(
it
.
key
()
+
"()"
)
!=
-
1
)
{
if
(
ext
->
metaObject
()
->
indexOfSlot
(
QByteArray
(
it
.
key
()
+
"()"
)
.
constData
())
!=
-
1
)
{
connect
(
act
,
SIGNAL
(
triggered
()),
ext
,
it
.
value
()
/* SLOT(slot name) */
);
connect
(
act
,
SIGNAL
(
triggered
()),
ext
,
it
.
value
()
/* SLOT(slot name) */
);
act
->
setEnabled
(
ext
->
isActionEnabled
(
it
.
key
()));
act
->
setEnabled
(
ext
->
isActionEnabled
(
it
.
key
()));
const
QString
text
=
ext
->
actionText
(
it
.
key
());
const
QString
text
=
ext
->
actionText
(
it
.
key
());
...
@@ -4149,7 +4149,7 @@ void KonqMainWindow::disconnectExtension(KParts::BrowserExtension *ext)
...
@@ -4149,7 +4149,7 @@ void KonqMainWindow::disconnectExtension(KParts::BrowserExtension *ext)
for
(;
it
!=
itEnd
;
++
it
)
{
for
(;
it
!=
itEnd
;
++
it
)
{
QAction
*
act
=
actionCollection
()
->
action
(
it
.
key
().
data
());
QAction
*
act
=
actionCollection
()
->
action
(
it
.
key
().
data
());
//qCDebug(KONQUEROR_LOG) << it.key();
//qCDebug(KONQUEROR_LOG) << it.key();
if
(
act
&&
ext
->
metaObject
()
->
indexOfSlot
(
it
.
key
()
+
"()"
)
!=
-
1
)
{
if
(
act
&&
ext
->
metaObject
()
->
indexOfSlot
(
QByteArray
(
it
.
key
()
+
"()"
)
.
constData
())
!=
-
1
)
{
//qCDebug(KONQUEROR_LOG) << act << act->name();
//qCDebug(KONQUEROR_LOG) << act << act->name();
act
->
disconnect
(
ext
);
act
->
disconnect
(
ext
);
}
}
...
...
Write
Preview
Supports
Markdown
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