Warning, /utilities/kate/apps/lib/autotests/data/test.diff is written in an unsupported language. File is not indexed.
0001 diff --git a/CMakeLists.txt b/CMakeLists.txt
0002 index d582ec6d0..c7fe5638e 100644
0003 --- a/CMakeLists.txt
0004 +++ b/CMakeLists.txt
0005 @@ -69,9 +69,9 @@ ecm_optional_add_subdirectory(apps)
0006 # our documentation
0007 ecm_optional_add_subdirectory(doc)
0008
0009 -ki18n_install(po)
0010 +# ki18n_install(po)
0011 if(KF5DocTools_FOUND)
0012 - kdoctools_install(po)
0013 + # kdoctools_install(po)
0014 endif()
0015
0016 feature_summary(INCLUDE_QUIET_PACKAGES WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
0017 diff --git a/addons/CMakeLists.txt b/addons/CMakeLists.txt
0018 index 277a5f214..a8fa2ab33 100644
0019 --- a/addons/CMakeLists.txt
0020 +++ b/addons/CMakeLists.txt
0021 @@ -28,7 +28,7 @@ ecm_optional_add_subdirectory(git-blame) # Inline git-blame viewer
0022 ecm_optional_add_subdirectory(kate-ctags)
0023 ecm_optional_add_subdirectory(katebuild-plugin)
0024 ecm_optional_add_subdirectory(katesql)
0025 -ecm_optional_add_subdirectory(konsole)
0026 +# ecm_optional_add_subdirectory(konsole)
0027 ecm_optional_add_subdirectory(latexunicodecompletion)
0028 ecm_optional_add_subdirectory(lspclient) # Language Server Protocol (LSP) client plugin.
0029 ecm_optional_add_subdirectory(preview) # Live preview of sources in target format.
0030 @@ -46,6 +46,7 @@ ecm_optional_add_subdirectory(cmake-tools)
0031 ecm_optional_add_subdirectory(keyboardmacros)
0032 ecm_optional_add_subdirectory(format)
0033 ecm_optional_add_subdirectory(eslint)
0034 +ecm_optional_add_subdirectory(vterm)
0035
0036 # TODO KF6 remove the migration leftovers
0037 if(QT_MAJOR_VERSION STREQUAL "5")
0038 diff --git a/addons/project/kateprojectinfoviewterminal.cpp b/addons/project/kateprojectinfoviewterminal.cpp
0039 index 86d42894a..63246273a 100644
0040 --- a/addons/project/kateprojectinfoviewterminal.cpp
0041 +++ b/addons/project/kateprojectinfoviewterminal.cpp
0042 @@ -86,6 +86,13 @@ void KateProjectInfoViewTerminal::showEvent(QShowEvent *)
0043 }
0044 }
0045
0046 +void KateProjectInfoViewTerminal::hideEvent(QHideEvent *)
0047 +{
0048 + if (m_searchInFilesAction) {
0049 + m_searchInFilesAction->setEnabled(true);
0050 + }
0051 +}
0052 +
0053 void KateProjectInfoViewTerminal::loadTerminal()
0054 {
0055 /**
0056 diff --git a/addons/project/kateprojectinfoviewterminal.h b/addons/project/kateprojectinfoviewterminal.h
0057 index e1f231648..499784266 100644
0058 --- a/addons/project/kateprojectinfoviewterminal.h
0059 +++ b/addons/project/kateprojectinfoviewterminal.h
0060 @@ -73,6 +73,7 @@ protected:
0061 * @param ev show event
0062 */
0063 void showEvent(QShowEvent *ev) override;
0064 + void hideEvent(QHideEvent *ev) override;
0065
0066 private:
0067 /**
0068 diff --git a/addons/python/CMakeLists.txt b/addons/python/CMakeLists.txt
0069 index 0bbaa531e..bff21cd7b 100644
0070 --- a/addons/python/CMakeLists.txt
0071 +++ b/addons/python/CMakeLists.txt
0072 @@ -16,7 +16,7 @@ if(NOT DEFINED PYSIDE_CUSTOM_PREFIX) #look for pyside in a custom location
0073 set(PYSIDE_CUSTOM_PREFIX "")
0074 endif()
0075
0076 -if(${PROJECT_NAME}_QT6)
0077 +if(QT_MAJOR_VERSION STREQUAL "6")
0078 set(PYSIDE_MAJOR_VERSION "6")
0079 set(PYTHON_BINDING_NAMESPACE "${PYTHON_BINDING_NAMESPACE}Qt${PYSIDE_MAJOR_VERSION}")
0080 set(QtWidgets_VERSION ${Qt6Widgets_VERSION})
0081 @@ -51,8 +51,8 @@ target_link_libraries(
0082 PRIVATE
0083 KF5::I18n
0084 KF5::TextEditor
0085 - Shiboken2::libshiboken
0086 - PySide2::pyside2
0087 + Shiboken6::libshiboken
0088 + PySide6::pyside6
0089 ${Python3_LIBRARIES}
0090 PyKate
0091 )
0092 diff --git a/apps/lib/CMakeLists.txt b/apps/lib/CMakeLists.txt
0093 index a87afe131..65d813e51 100644
0094 --- a/apps/lib/CMakeLists.txt
0095 +++ b/apps/lib/CMakeLists.txt
0096 @@ -67,11 +67,11 @@ if(KF5Activities_FOUND)
0097 endif()
0098
0099 # optional KUserFeedback integration
0100 -find_package(KUserFeedback)
0101 -if (TARGET KUserFeedbackWidgets)
0102 - target_link_libraries(kateprivate PRIVATE KUserFeedbackWidgets)
0103 - target_compile_definitions(kateprivate PUBLIC -DWITH_KUSERFEEDBACK)
0104 -endif()
0105 +# find_package(KUserFeedback)
0106 +# if (TARGET KUserFeedbackWidgets)
0107 +# target_link_libraries(kateprivate PRIVATE KUserFeedbackWidgets)
0108 +# target_compile_definitions(kateprivate PUBLIC -DWITH_KUSERFEEDBACK)
0109 +# endif()
0110
0111 ki18n_wrap_ui(kateprivate ui/sessionconfigwidget.ui welcomeview/welcomeview.ui session/katesessionmanagedialog.ui)
0112
0113 diff --git a/apps/lib/autotests/CMakeLists.txt b/apps/lib/autotests/CMakeLists.txt
0114 index 869e95abf..b08c0eac3 100644
0115 --- a/apps/lib/autotests/CMakeLists.txt
0116 +++ b/apps/lib/autotests/CMakeLists.txt
0117 @@ -27,4 +27,5 @@ kate_executable_tests(
0118 location_history_test
0119 kate_view_mgmt_tests
0120 bytearraysplitter_tests
0121 + diffwidget_tests
0122 )
0123 diff --git a/apps/lib/diff/diffwidget.cpp b/apps/lib/diff/diffwidget.cpp
0124 index 462554fe2..db07c7946 100644
0125 --- a/apps/lib/diff/diffwidget.cpp
0126 +++ b/apps/lib/diff/diffwidget.cpp
0127 @@ -994,6 +994,10 @@ void DiffWidget::openDiff(const QByteArray &raw)
0128 leftHl->setDefinition(KTextEditor::Editor::instance()->repository().definitionForName(QStringLiteral("Diff")));
0129 }
0130 m_rawDiff = raw;
0131 + QFile f(QStringLiteral("/home/waqar/kde/src/utilities/kate/build/out.diff"));
0132 + if (f.open(QFile::WriteOnly)) {
0133 + f.write(m_rawDiff);
0134 + }
0135 QMetaObject::invokeMethod(
0136 this,
0137 [this] {
0138 diff --git a/apps/lib/diff/diffwidget.h b/apps/lib/diff/diffwidget.h
0139 index 7a299f754..fa566a230 100644
0140 --- a/apps/lib/diff/diffwidget.h
0141 +++ b/apps/lib/diff/diffwidget.h
0142 @@ -6,6 +6,8 @@
0143 #include "diffeditor.h"
0144 #include <QWidget>
0145
0146 +#include "kateprivate_export.h"
0147 +
0148 #include <KTextEditor/Document>
0149
0150 namespace KSyntaxHighlighting
0151 @@ -28,10 +30,11 @@ private:
0152 static DiffWidget *existingDiffWidgetForParams(KateMainWindow *mw, const DiffParams &p);
0153 };
0154
0155 -class DiffWidget : public QWidget
0156 +class KATE_PRIVATE_EXPORT_H DiffWidget : public QWidget
0157 {
0158 Q_OBJECT
0159 friend DiffWidgetManager;
0160 + friend class DiffWidgetTests;
0161
0162 public:
0163 explicit DiffWidget(DiffParams p, QWidget *parent = nullptr);