From e4ca4018cac82395d5de17c726fac2d52516f2ec Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 7 Dec 2022 10:58:56 +0300 Subject: [PATCH] adopt for QtCreator 8, separate build --- project_fs/CMakeLists.txt | 16 +++++++++++----- project_fs/projectfilesystemwidget.cpp | 5 +++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/project_fs/CMakeLists.txt b/project_fs/CMakeLists.txt index 65bc32a..6893d25 100644 --- a/project_fs/CMakeLists.txt +++ b/project_fs/CMakeLists.txt @@ -1,7 +1,13 @@ -#cmake_minimum_required(VERSION 3.17) -#project(ProjectFilesystemPlugin) -#include($ENV{SDK_QTCREATOR_SRC}/cmake/QtCreatorAPI.cmake) +cmake_minimum_required(VERSION 3.17) +project(ProjectFilesystemPlugin) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_CXX_STANDARD 17) +find_package(QtCreator COMPONENTS Core REQUIRED) file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc") add_qtc_plugin(ProjectFilesystemPlugin - PLUGIN_DEPENDS Core ProjectExplorer - SOURCES ${SRC}) + PLUGIN_DEPENDS + QtCreator::Core + QtCreator::ProjectExplorer + SOURCES ${SRC}) diff --git a/project_fs/projectfilesystemwidget.cpp b/project_fs/projectfilesystemwidget.cpp index 3dde7f2..62298c9 100644 --- a/project_fs/projectfilesystemwidget.cpp +++ b/project_fs/projectfilesystemwidget.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -389,7 +390,7 @@ void ProjectFilesystemWidget::on_tree_itemDoubleClicked(QTreeWidgetItem * item, bool dir = item->data(0, roleIsDir).toBool(); if (dir) return; if (afp.isEmpty()) return; - Core::EditorManager::openEditor(afp); + Core::EditorManager::openEditor(Utils::FilePath::fromString(afp)); } @@ -464,7 +465,7 @@ void ProjectFilesystemWidget::on_tree_customContextMenuRequested(const QPoint & void ProjectFilesystemWidget::on_actionOpen_here_triggered() { if (projectfs_menu_target.path().isEmpty()) return; - Core::EditorManager::openEditor(projectfs_menu_target.absoluteFilePath(), Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); + Core::EditorManager::openEditor(Utils::FilePath::fromString(projectfs_menu_target.absoluteFilePath()), Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); }