feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/13.0' into qds/dev

Browse Source 
Change-Id: Ief07ead0b4cf513c70bd74d4f5e28e4642edc78e
This commit is contained in:
Tim Jenssen
2024-05-17 19:55:06 +02:00
parent fe7b46c28e e48a40bd8d
commit cbd36f93fa
23 changed files with 128 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidcreatekeystorecertificate.cpp
View File

@@ -275,7 +275,7 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
Process genKeyCertProc;
genKeyCertProc.setCommand(command);
using namespace std::chrono_literals;
genKeyCertProc.runBlocking(15s, EventLoopMode::On);
genKeyCertProc.runBlocking(15s);
if (genKeyCertProc.result() != ProcessResult::FinishedWithSuccess) {
QMessageBox::critical(this, Tr::tr("Error"),