diff --git a/doric-Qt/doric/doric.pro.user b/doric-Qt/doric/doric.pro.user index e70185e0..88721de2 100644 --- a/doric-Qt/doric/doric.pro.user +++ b/doric-Qt/doric/doric.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {824ffc72-3002-4c5f-b578-b99df65133bd} + {a49b4abd-08cf-4556-b46e-b0f44132419f} ProjectExplorer.Project.ActiveTarget @@ -49,47 +49,64 @@ true true true + *.md, *.MD, Makefile false + true ProjectExplorer.Project.PluginSettings - - -fno-delayed-template-parsing - + + true + true + true + true + true + + + 0 + true + true + Builtin.Questionable + + true + true + Builtin.DefaultTidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + Desktop + Desktop Qt 6.0.1 clang 64bit + Desktop Qt 6.0.1 clang 64bit + qt.qt6.601.clang_64_kit 0 0 0 - C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + 0 + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Debug + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Debug true QtProjectManager.QMakeBuildStep - true false - false - false + true Qt4ProjectManager.MakeStep - - false - - - false 2 Build @@ -100,11 +117,7 @@ true Qt4ProjectManager.MakeStep - - true clean - - false 1 Clean @@ -113,31 +126,27 @@ 2 false + Debug Qt4ProjectManager.Qt4BuildConfiguration 2 + 0 - C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Release + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Release + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Release true QtProjectManager.QMakeBuildStep - false false - false - true + true Qt4ProjectManager.MakeStep - - false - - - false 2 Build @@ -148,11 +157,7 @@ true Qt4ProjectManager.MakeStep - - true clean - - false 1 Clean @@ -161,31 +166,29 @@ 2 false + Release Qt4ProjectManager.Qt4BuildConfiguration 0 + 0 + 0 - C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + 0 + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Profile + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Profile true QtProjectManager.QMakeBuildStep - true false - true - true + true Qt4ProjectManager.MakeStep - - false - - - false 2 Build @@ -196,11 +199,7 @@ true Qt4ProjectManager.MakeStep - - true clean - - false 1 Clean @@ -209,10 +208,14 @@ 2 false + Profile Qt4ProjectManager.Qt4BuildConfiguration 0 + 0 + 0 + 0 3 @@ -223,10 +226,11 @@ ProjectExplorer.BuildSteps.Deploy 1 + + false ProjectExplorer.DefaultDeployConfiguration 1 - dwarf @@ -285,22 +289,17 @@ 13 14 + 2 - doric2 - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/admin/Workspace/Doric/doric-Qt/doric/doric.pro - C:/Users/admin/Workspace/Doric/doric-Qt/doric/doric.pro - - false - + Qt4ProjectManager.Qt4RunConfiguration:/Users/maverick/Workspace/Doric/doric-Qt/doric/doric.pro + /Users/maverick/Workspace/Doric/doric-Qt/doric/doric.pro false true true - false false true - - C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + /Users/maverick/Workspace/Doric/doric-Qt/build-doric-Desktop_Qt_6_0_1_clang_64bit-Debug/doric.app/Contents/MacOS 1 diff --git a/doric-Qt/doric/doric.pro.user.824ffc7 b/doric-Qt/doric/doric.pro.user.824ffc7 new file mode 100644 index 00000000..e70185e0 --- /dev/null +++ b/doric-Qt/doric/doric.pro.user.824ffc7 @@ -0,0 +1,320 @@ + + + + + + EnvironmentId + {824ffc72-3002-4c5f-b578-b99df65133bd} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + doric2 + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/admin/Workspace/Doric/doric-Qt/doric/doric.pro + C:/Users/admin/Workspace/Doric/doric-Qt/doric/doric.pro + + false + + false + true + true + false + false + true + + C:/Users/admin/Documents/build-doric-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/doric-Qt/doric/utils/DoricUtils.h b/doric-Qt/doric/utils/DoricUtils.h index dc593d29..00cb69e3 100644 --- a/doric-Qt/doric/utils/DoricUtils.h +++ b/doric-Qt/doric/utils/DoricUtils.h @@ -13,7 +13,7 @@ public: QFile *file = new QFile(resource.fileName()); file->open(QFile::ReadOnly | QFile::Text); QTextStream in(file); - in.setCodec("UTF-8"); + in.setAutoDetectUnicode(true); QString content = in.readAll(); file->close(); delete file;