diff options
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_README.md (renamed from share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md) | 0 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_qmake.yml (renamed from share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml) | 22 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro | 4 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json | 8 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/sessionmodel.cpp | 14 | ||||
| -rw-r--r-- | tests/system/suite_tools/tst_codepasting/test.py | 2 |
6 files changed, 26 insertions, 24 deletions
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_README.md index 8481ed15ae..8481ed15ae 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_README.md diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_qmake.yml index 17ffdfe9bf..5326dfeb9d 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_qmake.yml @@ -62,11 +62,11 @@ jobs: if ("${{ runner.os }}" STREQUAL "Windows") set(url_os "windows_x86") if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") - set(qt_package_name "qt.qt5.${qt_version_dotless}.win64_msvc2017_64") - set(qt_dir_prefix "${qt_version}/msvc2017_64") + set(qt_package_name "qt.qt5.${qt_version_dotless}.win64_msvc2019_64") + set(qt_dir_prefix "${qt_version}/msvc2019_64") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat") - set(qt_package_name "qt.qt5.${qt_version_dotless}.win32_msvc2017") - set(qt_dir_prefix "${qt_version}/msvc2017") + set(qt_package_name "qt.qt5.${qt_version_dotless}.win32_msvc2019") + set(qt_dir_prefix "${qt_version}/msvc2019") else() endif() elseif ("${{ runner.os }}" STREQUAL "Linux") @@ -131,14 +131,14 @@ jobs: set(qtc_output_directory "qtcreator/lib/qtcreator/plugins") set(qtc_binary_name "$ENV{PLUGIN_NAME}4.dll") if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") - set(qtc_platform "windows_msvc2017_x64") + set(qtc_platform "windows_x64") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat") - set(qtc_platform "windows_msvc2017_x86") + set(qtc_platform "windows_x86") endif() elseif ("${{ runner.os }}" STREQUAL "Linux") set(qtc_output_directory "qtcreator/lib/qtcreator/plugins") set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.so") - set(qtc_platform "linux_gcc_64_rhel72") + set(qtc_platform "linux_x64") elseif ("${{ runner.os }}" STREQUAL "macOS") set(qtc_output_directory "qtcreator/bin/Qt Creator.app/Contents/PlugIns") set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.dylib") @@ -167,7 +167,7 @@ jobs: ) endif() - - name: Configure + - name: Build shell: cmake -P {0} run: | if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x") @@ -179,9 +179,6 @@ jobs: foreach(line IN LISTS output_lines) if (line MATCHES "^([a-zA-Z0-9_-]+)=(.*)$") set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}") - - # Set for other steps - message("::set-env name=${CMAKE_MATCH_1}::${CMAKE_MATCH_2}") endif() endforeach() endif() @@ -200,9 +197,6 @@ jobs: message(FATAL_ERROR "Bad exit status") endif() - - name: Build - shell: cmake -P {0} - run: | if ("${{ runner.os }}" STREQUAL "Windows") set(ENV{PATH} "${{ steps.qt.outputs.qt_dir }}/bin/;$ENV{PATH}") else() diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro index 82328264a7..34eed0aeea 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro @@ -11,8 +11,8 @@ HEADERS += \\ %{ConstantsHdrFileName} DISTFILES += \\ - .github/workflow/build_qmake.yml \\ - .github/workflow/README.md + .github/workflows/build_qmake.yml \\ + .github/workflows/README.md # Qt Creator linking diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json index cbaca648fe..443fa25c25 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json @@ -190,12 +190,12 @@ "openAsProject": true }, { - "source": "github_workflow_build_qmake.yml", - "target": ".github/workflow/build_qmake.yml" + "source": "github_workflows_build_qmake.yml", + "target": ".github/workflows/build_qmake.yml" }, { - "source": "github_workflow_README.md", - "target": ".github/workflow/README.md" + "source": "github_workflows_README.md", + "target": ".github/workflows/README.md" }, { "source": "myplugin.cpp", diff --git a/src/plugins/projectexplorer/sessionmodel.cpp b/src/plugins/projectexplorer/sessionmodel.cpp index b0d847e7df..4cfa95eea5 100644 --- a/src/plugins/projectexplorer/sessionmodel.cpp +++ b/src/plugins/projectexplorer/sessionmodel.cpp @@ -183,10 +183,18 @@ void SessionModel::sort(int column, Qt::SortOrder order) beginResetModel(); const auto cmp = [column, order](const QString &s1, const QString &s2) { bool isLess; - if (column == 0) + if (column == 0) { + if (s1 == s2) + return false; isLess = s1 < s2; - else - isLess = SessionManager::sessionDateTime(s1) < SessionManager::sessionDateTime(s2); + } + else { + const auto s1time = SessionManager::sessionDateTime(s1); + const auto s2time = SessionManager::sessionDateTime(s2); + if (s1time == s2time) + return false; + isLess = s1time < s2time; + } if (order == Qt::DescendingOrder) isLess = !isLess; return isLess; diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index a5441050a9..37b9832c3a 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -239,7 +239,7 @@ def main(): clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) continue test.compare(filenameCombo.currentText, "%s: %s" % (protocol, pasteId), "Verify title of editor") - if protocol in (NAME_PBCOM, NAME_DPCOM) and pastedText.endswith("\n"): + if protocol in (NAME_DPCOM) and pastedText.endswith("\n"): pastedText = pastedText[:-1] test.compare(editor.plainText, pastedText, "Verify that pasted and fetched texts are the same") |