diff --git a/.vscode/settings.json b/.vscode/settings.json index c7fe1bb..b4207f3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,7 +20,7 @@ }, "cmake.environment": { "PATH": "${env:PATH};C:/Qt/Qt6.6.3/6.6.3/msvc2019_64/bin", - "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/home/xxx" + "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/home/typ/Qt5.14.2/5.14.2/gcc_64/bin" }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", diff --git a/CMakeLists.txt b/CMakeLists.txt index a168e90..0cce4d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project(OneLevelXmlOpr VERSION 0.1 LANGUAGES CXX) set(CMAKE_PREFIX_PATH "C:/Qt/Qt6.6.3/6.6.3/msvc2019_64" "/opt/homebrew/Cellar/qt@5/5.15.13_1" + "/home/typ/Qt5.14.2/5.14.2/gcc_64" ) set(CMAKE_AUTOUIC ON) @@ -24,7 +25,7 @@ set(PROJECT_SOURCES MainWidget.h MainWidget.ui 3rd/tinyxml2.cpp src/xml_opr.h src/xml_opr.cpp - src/config.h src/config.cpp public_def.cpp resource.qrc + src/config.h src/config.cpp public_def.cpp resource.qrc public_def.h resource/ico.rc src/attribute_edit.ui src/attribute_edit.h src/attribute_edit.cpp flatgray.qrc src/data_edit.h src/data_edit.cpp src/data_edit.ui diff --git a/main.cpp b/main.cpp index 9396f24..b38eaab 100644 --- a/main.cpp +++ b/main.cpp @@ -10,9 +10,9 @@ int main(int argc, char *argv[]) QFont font("Microsoft YaHei", 9); a.setFont(font); //a.setStyle("fusion"); - a.setStyle("windows"); #endif + a.setStyle("windows"); MainWidget w; w.set_work_exe(argv[0]); w.show(); diff --git a/public_def.cpp b/public_def.cpp index d84d70d..8b73cff 100644 --- a/public_def.cpp +++ b/public_def.cpp @@ -77,6 +77,14 @@ std::string CUtil::utf8_to_gbk(const std::string& utf8_str) return gbk_str; } +#else +std::string CUtil::utf8_to_gbk(const std::string& utf8_str) +{ + return utf8_str; +} +#endif + + std::vector CUtil::splitString(const std::string& input, const std::string& delimiter) { std::vector tokens; @@ -94,9 +102,4 @@ std::vector CUtil::splitString(const std::string& input, const std: return tokens; } -#else -std::string CUtil::utf8_to_gbk(const std::string& utf8_str) -{ - return utf8_str; -} -#endif +