linux正常使用

andrewbytecoder · andrewbytecoder · commit 655077b2403a · 2023-10-11T22:57:00.000+08:00
diff --git a/qt_clion/CMakeLists.txt b/qt_clion/CMakeLists.txt
@@ -23,45 +23,6 @@ if (NOT CMAKE_PREFIX_PATH)
 endif ()
 
 
-## 添加用户界面文件
-#set(FORMS
-#        mainwindow.ui
-#        )
-
-# 自动生成用户界面文件的 C++ 代码
-#qt5_wrap_ui(UI_HEADERS ${FORMS})
-
-# 自动生成用户界面文件的 C++ 代码
-# 自动生成用户界面文件的 C++ 代码
-#set(UI_HEADERS)
-if(WIN32)
-
-#foreach(FORM ${FORMS})
-#    get_filename_component(FORM_BASE ${FORM} NAME_WE)
-#    set(UI_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ui_${FORM_BASE}.h")
-#    list(APPEND UI_HEADERS ${UI_HEADER})
-#    add_custom_command(
-#            OUTPUT ${UI_HEADER}
-#            COMMAND ${Qt5_DIR}/../../../bin/uic ${CMAKE_CURRENT_SOURCE_DIR}/${FORM} -o ${UI_HEADER}
-#            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FORM}
-#    )
-#endforeach()
-
-else()
-#    foreach(FORM ${FORMS})
-#        get_filename_component(FORM_BASE ${FORM} NAME_WE)
-#        set(UI_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ui_${FORM_BASE}.h")
-#        list(APPEND UI_HEADERS ${UI_HEADER})
-#        add_custom_command(
-#                OUTPUT ${UI_HEADER}
-#                COMMAND /usr/bin/uic ${CMAKE_CURRENT_SOURCE_DIR}/${FORM} -o ${UI_HEADER}
-#                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FORM}
-#        )
-#    endforeach()
-
-endif()
-
-
 add_executable(${PROJECT_NAME}
     main.cpp
     mainwindow.cpp)
diff --git a/qt_screenshot/CMakeLists.txt b/qt_screenshot/CMakeLists.txt
@@ -38,28 +38,8 @@ endif ()
 #set(UI_HEADERS)
 if(WIN32)
 
-#foreach(FORM ${FORMS})
-#    get_filename_component(FORM_BASE ${FORM} NAME_WE)
-#    set(UI_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ui_${FORM_BASE}.h")
-#    list(APPEND UI_HEADERS ${UI_HEADER})
-#    add_custom_command(
-#            OUTPUT ${UI_HEADER}
-#            COMMAND ${Qt5_DIR}/../../../bin/uic ${CMAKE_CURRENT_SOURCE_DIR}/${FORM} -o ${UI_HEADER}
-#            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FORM}
-#    )
-#endforeach()
 
-else()
-#    foreach(FORM ${FORMS})
-#        get_filename_component(FORM_BASE ${FORM} NAME_WE)
-#        set(UI_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ui_${FORM_BASE}.h")
-#        list(APPEND UI_HEADERS ${UI_HEADER})
-#        add_custom_command(
-#                OUTPUT ${UI_HEADER}
-#                COMMAND /usr/bin/uic ${CMAKE_CURRENT_SOURCE_DIR}/${FORM} -o ${UI_HEADER}
-#                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FORM}
-#        )
-#    endforeach()
+else(UNIX)
 
 endif()
 
@@ -74,6 +54,14 @@ add_executable(${PROJECT_NAME}
         ${utils_src}
         )
 
+
+#find_package(PkgConfig REQUIRED)
+#pkg_search_module(GTK REQUIRED gtk+-3.0)
+#
+#include_directories(${GTK_INCLUDE_DIRS})
+#link_directories(${GTK_LIBRARY_DIRS})
+#target_link_libraries(${PROJECT_NAME} ${GTK_LIBRARIES})
+
 #if(WIN32)
 #    target_link_libraries(${PROJECT_NAME} xcb xcb-util)
 #endif()
diff --git a/qt_screenshot/fireshot.cpp b/qt_screenshot/fireshot.cpp
@@ -11,9 +11,6 @@
 FireShot::FireShot(QWidget *parent) :
         QMainWindow(parent), ui(new Ui::FireShot) {
     ui->setupUi(this);
-#ifdef Q_OS_UNIX
-    gdk_init(NULL, NULL);
-#endif // Q_OS_LINUX
 }
 
 FireShot::~FireShot() {
diff --git a/qt_screenshot/utils/spdlog_wrapper.cpp b/qt_screenshot/utils/spdlog_wrapper.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "spdlog_wrapper.h"
-#include <QDebug>
 #include "spdlog/spdlog.h"
 #include "spdlog/cfg/env.h"  // support for loading levels from the environment variable
 #include "spdlog/fmt/ostr.h" // support for user defined types

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@`
`11`	`11`	`FireShot::FireShot(QWidget *parent) :`
`12`	`12`	`QMainWindow(parent), ui(new Ui::FireShot) {`
`13`	`13`	`ui->setupUi(this);`
`14`		`-#ifdef Q_OS_UNIX`
`15`		`- gdk_init(NULL, NULL);`
`16`		`-#endif // Q_OS_LINUX`
`17`	`14`	`}`
`18`	`15`
`19`	`16`	`FireShot::~FireShot() {`