mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04:36:34 +01:00
Remove a couple of extra lines and unnecessary changes, and make TODOs searchable.
This commit is contained in:
parent
632cd4c4ba
commit
d10379268b
@ -79,7 +79,7 @@ static QString getTopLevelDomain(const QUrl &url)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//return qt_ACE_do(tld, ToAceOnly, AllowLeadingDot, {});
|
//return qt_ACE_do(tld, ToAceOnly, AllowLeadingDot, {});
|
||||||
// TODO - QUrl::toAce() uses ForbidLeadingDot, while the old QUrl::topLevelDomain() used AllowLeadingDot. Does this matter?
|
// TODO QT6 - QUrl::toAce() uses ForbidLeadingDot, while the old QUrl::topLevelDomain() used AllowLeadingDot. Does this matter?
|
||||||
return QString(QUrl::toAce(tld));
|
return QString(QUrl::toAce(tld));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -123,7 +123,7 @@ private:
|
|||||||
void setNotNull()
|
void setNotNull()
|
||||||
{
|
{
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
// TODO: This is a really hacky way of keeping track of whether the script has been initialized - and is it even necessary?
|
// TODO QT6: This is a really hacky way of keeping track of whether the script has been initialized - and is it even necessary?
|
||||||
m_isNull = false;
|
m_isNull = false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -35,8 +35,7 @@ if (UNIX AND NOT APPLE)
|
|||||||
if (KF${KF_MAJOR_VERSION}I18n_FOUND)
|
if (KF${KF_MAJOR_VERSION}I18n_FOUND)
|
||||||
ki18n_install(${CMAKE_SOURCE_DIR}/po)
|
ki18n_install(${CMAKE_SOURCE_DIR}/po)
|
||||||
endif()
|
endif()
|
||||||
# TODO Qt6 port ?
|
ecm_install_po_files_as_qm(${CMAKE_SOURCE_DIR}/poqm)
|
||||||
#ecm_install_po_files_as_qm(${CMAKE_SOURCE_DIR}/poqm)
|
|
||||||
|
|
||||||
install(PROGRAMS ../../linux/applications/org.kde.falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
install(PROGRAMS ../../linux/applications/org.kde.falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@ add_subdirectory(GreaseMonkey)
|
|||||||
add_subdirectory(MouseGestures)
|
add_subdirectory(MouseGestures)
|
||||||
add_subdirectory(PIM)
|
add_subdirectory(PIM)
|
||||||
add_subdirectory(StatusBarIcons)
|
add_subdirectory(StatusBarIcons)
|
||||||
## TODO ## add_subdirectory(TabManager)
|
## TODO QT6 ## add_subdirectory(TabManager)
|
||||||
## TODO ## add_subdirectory(VerticalTabs)
|
## TODO QT6 ## add_subdirectory(VerticalTabs)
|
||||||
|
|
||||||
if (GNOME_KEYRING_FOUND)
|
if (GNOME_KEYRING_FOUND)
|
||||||
add_subdirectory(GnomeKeyringPasswords)
|
add_subdirectory(GnomeKeyringPasswords)
|
||||||
|
@ -113,6 +113,8 @@ void SBI_NetworkIcon::updateToolTip()
|
|||||||
tooltip = tooltip.arg(tr("Offline"));
|
tooltip = tooltip.arg(tr("Offline"));
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
// TODO QT6 - in Qt6 we're always reporting as online, should we just remove this functionality instead?
|
||||||
|
// Or is there a way to detect network status in Qt6?
|
||||||
tooltip = tooltip.arg(tr("Connected"));
|
tooltip = tooltip.arg(tr("Connected"));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ private:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||||
// TODO - should we try to replace the online status detection using Qt 6?
|
// TODO QT6 - should we try to replace the online status detection using Qt 6?
|
||||||
QNetworkConfigurationManager* m_networkConfiguration;
|
QNetworkConfigurationManager* m_networkConfiguration;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user