diff --git a/CustomComponent.pro.user b/CustomComponent.pro.user index 6c9c767c9afbb2882643a2b3e5519fe093e1f34f..a6ad122d60425b17ba658378205e67120726ffd7 100644 --- a/CustomComponent.pro.user +++ b/CustomComponent.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {8ea9572b-2520-4c5a-b78a-d5bc20986e94} + {a2976e5b-6424-4a04-b229-e79d412e6847} ProjectExplorer.Project.ActiveTarget @@ -54,19 +54,24 @@ ProjectExplorer.Project.PluginSettings - + + + -fno-delayed-template-parsing + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.7.0 MSVC2013 64bit - Desktop Qt 5.7.0 MSVC2013 64bit - qt.57.win64_msvc2013_64_kit + Desktop Qt 5.12.5 MinGW 64-bit + Desktop Qt 5.12.5 MinGW 64-bit + qt.qt5.5125.win64_mingw73_kit 0 0 - 5 + 0 - G:/work_test/QtCustomComponent/BIN + E:/CustomComponent/BIN true @@ -84,13 +89,14 @@ Make Qt4ProjectManager.MakeStep - + false + false 2 - 构建 + Build ProjectExplorer.BuildSteps.Build @@ -100,13 +106,14 @@ Make Qt4ProjectManager.MakeStep - + true clean + false 1 - 清理 + Clean ProjectExplorer.BuildSteps.Clean @@ -114,13 +121,13 @@ false Debug - + Debug Qt4ProjectManager.Qt4BuildConfiguration 2 true - G:/work_test/QtCustomComponent/BIN + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Release true @@ -131,20 +138,21 @@ false false - false + true true Make Qt4ProjectManager.MakeStep - + false + false 2 - 构建 + Build ProjectExplorer.BuildSteps.Build @@ -154,13 +162,14 @@ Make Qt4ProjectManager.MakeStep - + true clean + false 1 - 清理 + Clean ProjectExplorer.BuildSteps.Clean @@ -168,13 +177,13 @@ false Release - + Release Qt4ProjectManager.Qt4BuildConfiguration 0 true - G:/work_test/QtCustomComponent/build-CustomComponent-Desktop_Qt_5_7_0_MSVC2013_64bit-Profile + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Profile true @@ -185,20 +194,21 @@ false true - false + true true Make Qt4ProjectManager.MakeStep - + false + false 2 - 构建 + Build ProjectExplorer.BuildSteps.Build @@ -208,13 +218,14 @@ Make Qt4ProjectManager.MakeStep - + true clean + false 1 - 清理 + Clean ProjectExplorer.BuildSteps.Clean @@ -222,7 +233,7 @@ false Profile - + Profile Qt4ProjectManager.Qt4BuildConfiguration 0 true @@ -236,13 +247,22 @@ ProjectExplorer.BuildSteps.Deploy 1 - 在本地部署 + Deploy Configuration ProjectExplorer.DefaultDeployConfiguration 1 + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -257,6 +277,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -284,23 +305,30 @@ 2 - datetime + autologin - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/datetime/datetime.pro - true - - datetime/datetime.pro - false - - G:/work_test/QtCustomComponent/BIN/datetime + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/autologin/autologin.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/autologin + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -315,6 +343,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -342,23 +371,30 @@ 2 - listwidget + chart - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/listwidget/listwidget.pro - true - - listwidget/listwidget.pro - false - - G:/work_test/QtCustomComponent/BIN/listwidget + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/chart/chart.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/chart + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -373,6 +409,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -400,23 +437,30 @@ 2 - autologin + maskwidget - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/autologin/autologin.pro - true - - autologin/autologin.pro - false - - G:/work_test/QtCustomComponent/BIN/autologin + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/maskwidget/maskwidget.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/maskwidget + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -431,6 +475,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -458,23 +503,30 @@ 2 - tablewidget + matrix - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/tablewidget/tablewidget.pro - true - - tablewidget/tablewidget.pro - false - - G:/work_test/QtCustomComponent/BIN/tablewidget + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/matrix/matrix.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/matrix + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -489,6 +541,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -516,23 +569,30 @@ 2 - datetimerange + messagecenter - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/datetimerange/datetimerange.pro - true - - datetimerange/datetimerange.pro - false - - G:/work_test/QtCustomComponent/BIN/datetimerange + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/messagecenter/messagecenter.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/messagecenter + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -547,6 +607,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -574,23 +635,30 @@ 2 - datetime2 + pagenavigation - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/datetime2/datetime2.pro - true - - datetime2/datetime2.pro - false - - G:/work_test/QtCustomComponent/BIN/datetime2 + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/pagenavigation/pagenavigation.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/pagenavigation + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -605,6 +673,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -632,23 +701,30 @@ 2 - searchline + painter - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/searchline/searchline.pro - true - - searchline/searchline.pro - false - - + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/painter/painter.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/painter + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -663,6 +739,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -690,23 +767,30 @@ 2 - pagenavigation + passwdcheck - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/pagenavigation/pagenavigation.pro - true - - pagenavigation/pagenavigation.pro - false - - + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/passwdcheck/passwdcheck.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/passwdcheck + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -721,6 +805,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -748,23 +833,30 @@ 2 - chart + searchline - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/chart/chart.pro - true - - chart/chart.pro - false - - G:/work_test/QtCustomComponent/BIN/chart + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/searchline/searchline.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/searchline + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -779,6 +871,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -806,23 +899,30 @@ 2 - painter + tablewidget - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/painter/painter.pro - true - - painter/painter.pro - false - - G:/work_test/QtCustomComponent/BIN/painter + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/tablewidget/tablewidget.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/tablewidget + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -837,6 +937,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -864,23 +965,30 @@ 2 - colordialog + treewidget - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/colordialog/colordialog.pro - true - - colordialog/colordialog.pro - false - - + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/treewidget/treewidget.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/treewidget + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -895,6 +1003,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -922,23 +1031,30 @@ 2 - treewidget + colordialog - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/treewidget/treewidget.pro - true - - treewidget/treewidget.pro - false - - G:/work_test/QtCustomComponent/BIN/treewidget + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/colordialog/colordialog.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/colordialog + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -953,6 +1069,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -980,23 +1097,30 @@ 2 - ipconfig + combobox - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/ipconfig/ipconfig.pro - true - - ipconfig/ipconfig.pro - false - - G:/work_test/QtCustomComponent/BIN/ipconfig + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/combobox/combobox.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/combobox + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1011,6 +1135,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -1038,23 +1163,30 @@ 2 - maskwidget + datetime - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/maskwidget/maskwidget.pro - true - - maskwidget/maskwidget.pro - false - - G:/work_test/QtCustomComponent/BIN/maskwidget + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/datetime/datetime.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/datetime + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1069,6 +1201,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -1096,23 +1229,30 @@ 2 - combobox + datetime2 - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/combobox/combobox.pro - true - - combobox/combobox.pro - false - - G:/work_test/QtCustomComponent/BIN/combobox + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/datetime2/datetime2.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/datetime2 + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1127,6 +1267,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -1154,23 +1295,30 @@ 2 - passwdcheck + datetimerange - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/passwdcheck/passwdcheck.pro - true - - passwdcheck/passwdcheck.pro - false - - G:/work_test/QtCustomComponent/BIN/passwdcheck + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/datetimerange/datetimerange.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/datetimerange + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1185,6 +1333,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -1212,23 +1361,30 @@ 2 - matrix + ipconfig - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/matrix/matrix.pro - true - - matrix/matrix.pro - false - - G:/work_test/QtCustomComponent/BIN/matrix + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/ipconfig/ipconfig.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/ipconfig + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1243,6 +1399,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -1270,23 +1427,30 @@ 2 - messagecenter + listwidget - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/messagecenter/messagecenter.pro - true - - messagecenter/messagecenter.pro - false - - G:/work_test/QtCustomComponent/BIN/messagecenter + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/listwidget/listwidget.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/listwidget + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1301,6 +1465,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -1329,20 +1494,18 @@ 2 mainwindow - mainwindow2 - Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/mainwindow/mainwindow.pro - true - - mainwindow/mainwindow.pro - false - - G:/work_test/QtCustomComponent/BIN/mainwindow + + Qt4ProjectManager.Qt4RunConfiguration:E:/CustomComponent/CustomComponent/mainwindow/mainwindow.pro + 3768 false true + true false false true + + E:/CustomComponent/build-CustomComponent-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/mainwindow 19 @@ -1353,10 +1516,10 @@ ProjectExplorer.Project.Updater.FileVersion - 18 + 22 Version - 18 + 22 diff --git a/CustomComponent.pro.user.8ea9572.4.8-pre1 b/CustomComponent.pro.user.8ea9572.4.8-pre1 new file mode 100644 index 0000000000000000000000000000000000000000..6c9c767c9afbb2882643a2b3e5519fe093e1f34f --- /dev/null +++ b/CustomComponent.pro.user.8ea9572.4.8-pre1 @@ -0,0 +1,1362 @@ + + + + + + EnvironmentId + {8ea9572b-2520-4c5a-b78a-d5bc20986e94} + + + 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 + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.7.0 MSVC2013 64bit + Desktop Qt 5.7.0 MSVC2013 64bit + qt.57.win64_msvc2013_64_kit + 0 + 0 + 5 + + G:/work_test/QtCustomComponent/BIN + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + G:/work_test/QtCustomComponent/BIN + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + G:/work_test/QtCustomComponent/build-CustomComponent-Desktop_Qt_5_7_0_MSVC2013_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + 在本地部署 + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + datetime + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/datetime/datetime.pro + true + + datetime/datetime.pro + false + + G:/work_test/QtCustomComponent/BIN/datetime + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + listwidget + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/listwidget/listwidget.pro + true + + listwidget/listwidget.pro + false + + G:/work_test/QtCustomComponent/BIN/listwidget + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + autologin + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/autologin/autologin.pro + true + + autologin/autologin.pro + false + + G:/work_test/QtCustomComponent/BIN/autologin + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + tablewidget + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/tablewidget/tablewidget.pro + true + + tablewidget/tablewidget.pro + false + + G:/work_test/QtCustomComponent/BIN/tablewidget + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + datetimerange + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/datetimerange/datetimerange.pro + true + + datetimerange/datetimerange.pro + false + + G:/work_test/QtCustomComponent/BIN/datetimerange + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + datetime2 + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/datetime2/datetime2.pro + true + + datetime2/datetime2.pro + false + + G:/work_test/QtCustomComponent/BIN/datetime2 + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + searchline + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/searchline/searchline.pro + true + + searchline/searchline.pro + false + + + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pagenavigation + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/pagenavigation/pagenavigation.pro + true + + pagenavigation/pagenavigation.pro + false + + + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + chart + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/chart/chart.pro + true + + chart/chart.pro + false + + G:/work_test/QtCustomComponent/BIN/chart + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + painter + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/painter/painter.pro + true + + painter/painter.pro + false + + G:/work_test/QtCustomComponent/BIN/painter + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + colordialog + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/colordialog/colordialog.pro + true + + colordialog/colordialog.pro + false + + + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + treewidget + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/treewidget/treewidget.pro + true + + treewidget/treewidget.pro + false + + G:/work_test/QtCustomComponent/BIN/treewidget + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + ipconfig + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/ipconfig/ipconfig.pro + true + + ipconfig/ipconfig.pro + false + + G:/work_test/QtCustomComponent/BIN/ipconfig + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + maskwidget + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/maskwidget/maskwidget.pro + true + + maskwidget/maskwidget.pro + false + + G:/work_test/QtCustomComponent/BIN/maskwidget + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + combobox + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/combobox/combobox.pro + true + + combobox/combobox.pro + false + + G:/work_test/QtCustomComponent/BIN/combobox + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + passwdcheck + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/passwdcheck/passwdcheck.pro + true + + passwdcheck/passwdcheck.pro + false + + G:/work_test/QtCustomComponent/BIN/passwdcheck + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + matrix + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/matrix/matrix.pro + true + + matrix/matrix.pro + false + + G:/work_test/QtCustomComponent/BIN/matrix + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + messagecenter + + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/messagecenter/messagecenter.pro + true + + messagecenter/messagecenter.pro + false + + G:/work_test/QtCustomComponent/BIN/messagecenter + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + mainwindow + mainwindow2 + Qt4ProjectManager.Qt4RunConfiguration:G:/work_test/QtCustomComponent/CustomComponent/mainwindow/mainwindow.pro + true + + mainwindow/mainwindow.pro + false + + G:/work_test/QtCustomComponent/BIN/mainwindow + 3768 + false + true + false + false + true + + 19 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/combobox/tablewidget.cpp b/combobox/tablewidget.cpp index 497134a36532f0a5ad7f4f4efb0df3f1d91d95fc..1d396c00ac493dae45c868a9e1a288d86bbfc2d2 100644 --- a/combobox/tablewidget.cpp +++ b/combobox/tablewidget.cpp @@ -1,7 +1,7 @@ #include "tablewidget.h" #include "ui_listwidgetitem.h" #include - +#include static QMap m_mSelected; TableWidget::TableWidget(QWidget *parent) : QTableWidget(parent), m_pCellPos(0, 0) diff --git a/datetime/datetime.cpp b/datetime/datetime.cpp index ed9748ea0ba24e8841f9ec76d8c9c6f04259537d..4c1086d76379dfb8fe85bd507bf96612b83c5757 100644 --- a/datetime/datetime.cpp +++ b/datetime/datetime.cpp @@ -234,6 +234,9 @@ void ScrollBar::paintText(QPainter *pPainter, int nValue, int nOffSet, int nFont pPainter->setBrush(Qt::NoBrush); pPainter->setFont(font); + int textHeight = pPainter->fontMetrics().height(); + int initY = nHeight / 2 + nOffSet - textHeight / 2; + if(m_nType == ScrollType::HORIZONTAL) { int textWidth = pPainter->fontMetrics().width(nValue); @@ -244,8 +247,6 @@ void ScrollBar::paintText(QPainter *pPainter, int nValue, int nOffSet, int nFont goto NEXT; } - int textHeight = pPainter->fontMetrics().height(); - int initY = nHeight / 2 + nOffSet - textHeight / 2; pPainter->drawText(QRect(0, initY, nWidth, textHeight), Qt::AlignCenter, QString::number(nValue)); NEXT: diff --git a/datetime2/date_time_edit.cpp b/datetime2/date_time_edit.cpp index 8e99cbed59354a845f7f3edf292ec1285d801536..ba3ad6cf87541a8a890f1924e5d6822458660f03 100644 --- a/datetime2/date_time_edit.cpp +++ b/datetime2/date_time_edit.cpp @@ -31,7 +31,7 @@ void DateTimeEdit::initPage() connect(cell, static_cast(&DateTimeWidget::signal_dateTime), this, [this](const QDateTime& dt) { - this->setEditText(dt.toString("yyyy-mm-dd hh:MM:ss")); + this->setEditText(dt.toString("yyyy-MM-dd hh:mm:ss")); this->hidePopup(); }); @@ -43,7 +43,7 @@ void DateTimeEdit::initPage() void DateTimeEdit::setDateTime(const QDateTime& dt) { - this->setEditText(dt.toString("yyyy-mm-dd hh:MM:ss")); + this->setEditText(dt.toString("yyyy-MM-dd hh:mm:ss")); auto pTable = static_cast(const_cast(view())); auto pWidget = static_cast(pTable->cellWidget(0, 0)); @@ -53,5 +53,5 @@ void DateTimeEdit::setDateTime(const QDateTime& dt) QDateTime DateTimeEdit::datetime() const { - return QDateTime::fromString(this->currentText(), "yyyy-mm-dd hh:MM:ss"); + return QDateTime::fromString(this->currentText(), "yyyy-MM-dd hh:mm:ss"); } diff --git a/datetimerange/date_time.cpp b/datetimerange/date_time.cpp index 4dd0191eb68fcdc403a671b6ec49f20461589647..57b24bde9f7d1ee59c90b76b7524fbfbc95b3b2f 100644 --- a/datetimerange/date_time.cpp +++ b/datetimerange/date_time.cpp @@ -234,6 +234,9 @@ void ScrollBar::paintText(QPainter *pPainter, int nValue, int nOffSet, int nFont pPainter->setBrush(Qt::NoBrush); pPainter->setFont(font); + int textHeight = pPainter->fontMetrics().height(); + int initY = nHeight / 2 + nOffSet - textHeight / 2; + if(m_nType == ScrollType::HORIZONTAL) { int textWidth = pPainter->fontMetrics().width(nValue); @@ -244,8 +247,6 @@ void ScrollBar::paintText(QPainter *pPainter, int nValue, int nOffSet, int nFont goto NEXT; } - int textHeight = pPainter->fontMetrics().height(); - int initY = nHeight / 2 + nOffSet - textHeight / 2; pPainter->drawText(QRect(0, initY, nWidth, textHeight), Qt::AlignCenter, QString::number(nValue)); NEXT: diff --git a/matrix/matrixwidget.cpp b/matrix/matrixwidget.cpp index 8c7ad516550095bb6f05b80e3c7385aa997f04d7..7d4a0b345e0d59d6d23f012764aefdf823ff79ad 100644 --- a/matrix/matrixwidget.cpp +++ b/matrix/matrixwidget.cpp @@ -2,9 +2,9 @@ #include "ui_matrixwidget.h" #include -MatrixWidget::MatrixWidget(QWidget *parent) : - QWidget(parent), - ui(new Ui::MatrixWidget) +#define DBL_MAX 10000 + +MatrixWidget::MatrixWidget(QWidget *parent) : QWidget(parent),ui(new Ui::MatrixWidget) { ui->setupUi(this); diff --git a/painter/draw_tool_defines.h b/painter/draw_tool_defines.h index 60224542e81087084279ebabcd9ecc6c443baf6c..79270dcdf559bec701097c991fa60c8ac60b9966 100644 --- a/painter/draw_tool_defines.h +++ b/painter/draw_tool_defines.h @@ -64,7 +64,7 @@ private: *this = variant.value(); } }; - Q_DECLARE_METATYPE(ImageShow) + enum BrushStroke { @@ -96,7 +96,7 @@ private: *this = variant.value(); } }; - Q_DECLARE_METATYPE(DrawToolData) + struct Polygon { @@ -123,9 +123,10 @@ private: filled = false; paintend = false; } - }; - Q_DECLARE_METATYPE(Polygon) + }; } - +Q_DECLARE_METATYPE(DrawTool::ImageShow) +Q_DECLARE_METATYPE(DrawTool::DrawToolData) +Q_DECLARE_METATYPE(DrawTool::Polygon) #endif // DRWA_TOOL_DEFINES_H diff --git a/passwdcheck/passwd_check_widget.cpp b/passwdcheck/passwd_check_widget.cpp index 0c861aacad22d30f3e18752b92c3aa43adbe6893..96a0986f11098cb2604569020700a8994115f421 100644 --- a/passwdcheck/passwd_check_widget.cpp +++ b/passwdcheck/passwd_check_widget.cpp @@ -1,6 +1,6 @@ #include "passwd_check_widget.h" #include "ui_passwd_check_widget.h" - +#include PasswdCheckWidget::PasswdCheckWidget(QWidget *parent) : QWidget(parent), ui(new Ui::PasswdCheckWidget) { ui->setupUi(this);