Skip to content

Commit

Permalink
fix Qt4 compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo committed Feb 15, 2017
1 parent c0242d9 commit 23b3f86
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions OMEdit/OMEditGUI/Git/CleanDialog.cpp
Expand Up @@ -51,8 +51,11 @@ CleanDialog::CleanDialog(QWidget *pParent)
mpButtonBox->addButton(mpCleanRepositoryButton, QDialogButtonBox::ActionRole);
mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole);
//
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
connect(mpSelectAllCheckBox, &QAbstractButton::clicked, this, &CleanDialog::selectAllItems);
connect(mpCleanFilesTreeView, &QAbstractItemView::clicked, this, &CleanDialog::updateSelectAllCheckBox);
#else // Qt4
#endif
// set the layout
QGridLayout *pMainLayout = new QGridLayout;
pMainLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
Expand Down
3 changes: 3 additions & 0 deletions OMEdit/OMEditGUI/Traceability/TraceabilityQueryDialog.cpp
Expand Up @@ -124,6 +124,7 @@ void TraceabilityQueryDialog::queryTraceabilityInformation()
void TraceabilityQueryDialog::readTraceabilityInformation(QNetworkReply *pNetworkReply)
{
QString strReply = (QString)pNetworkReply->readAll();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
QJsonDocument doc = QJsonDocument::fromJson(strReply.toUtf8());
QString formattedJsonString = doc.toJson(QJsonDocument::Indented);
mpTraceabilityInformationTextBox->setPlainText(formattedJsonString);
Expand All @@ -134,5 +135,7 @@ void TraceabilityQueryDialog::readTraceabilityInformation(QNetworkReply *pNetwor
}
else
pNetworkReply->deleteLater();
#else // Qt4
#endif
// accept();
}

0 comments on commit 23b3f86

Please sign in to comment.