diff options
Diffstat (limited to 'src/libs/installer/performinstallationform.cpp')
-rw-r--r-- | src/libs/installer/performinstallationform.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp index d9a99e71c..dbf059c94 100644 --- a/src/libs/installer/performinstallationform.cpp +++ b/src/libs/installer/performinstallationform.cpp @@ -122,13 +122,13 @@ void PerformInstallationForm::setupUi(QWidget *widget) m_downloadStatus->setObjectName(QLatin1String("DownloadStatus")); m_downloadStatus->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); topLayout->addWidget(m_downloadStatus); - connect(ProgressCoordinator::instance(), SIGNAL(downloadStatusChanged(QString)), this, - SLOT(onDownloadStatusChanged(QString))); + connect(ProgressCoordinator::instance(), &ProgressCoordinator::downloadStatusChanged, this, + &PerformInstallationForm::onDownloadStatusChanged); m_detailsButton = new QPushButton(tr("&Show Details"), widget); m_detailsButton->setObjectName(QLatin1String("DetailsButton")); m_detailsButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); - connect(m_detailsButton, SIGNAL(clicked()), this, SLOT(toggleDetails())); + connect(m_detailsButton, &QAbstractButton::clicked, this, &PerformInstallationForm::toggleDetails); topLayout->addWidget(m_detailsButton); QVBoxLayout *bottomLayout = new QVBoxLayout(); @@ -147,7 +147,8 @@ void PerformInstallationForm::setupUi(QWidget *widget) baseLayout->addLayout(bottomLayout); m_updateTimer = new QTimer(widget); - connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateProgress())); //updateProgress includes label + connect(m_updateTimer, &QTimer::timeout, + this, &PerformInstallationForm::updateProgress); //updateProgress includes label m_updateTimer->setInterval(30); m_progressBar->setRange(0, 100); @@ -181,7 +182,7 @@ void PerformInstallationForm::updateProgress() m_progressBar->setValue(progressPercentage); #ifdef Q_OS_WIN if (m_taskButton) { - if (!m_taskButton->window()) + if (!m_taskButton->window() && QApplication::activeWindow()) m_taskButton->setWindow(QApplication::activeWindow()->windowHandle()); m_taskButton->progress()->setValue(progressPercentage); } |