aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/projectexplorer/customwizard/customwizardpage.cpp')
-rw-r--r--src/plugins/projectexplorer/customwizard/customwizardpage.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
index a17a242c73..d171ef05fd 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
@@ -42,7 +42,7 @@
#include <QVBoxLayout>
#include <QLineEdit>
#include <QLabel>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
#include <QComboBox>
#include <QTextEdit>
#include <QSpacerItem>
@@ -284,9 +284,9 @@ QWidget *CustomWizardFieldPage::registerLineEdit(const QString &fieldName,
const QString validationRegExp = field.controlAttributes.value(QLatin1String("validator"));
if (!validationRegExp.isEmpty()) {
- QRegExp re(validationRegExp);
+ QRegularExpression re(validationRegExp);
if (re.isValid())
- lineEdit->setValidator(new QRegExpValidator(re, lineEdit));
+ lineEdit->setValidator(new QRegularExpressionValidator(re, lineEdit));
else
qWarning("Invalid custom wizard field validator regular expression %s.", qPrintable(validationRegExp));
}
@@ -360,8 +360,8 @@ void CustomWizardFieldPage::cleanupPage()
PathChooserData &ped = m_pathChoosers[i];
QString defaultText = ped.defaultText;
CustomWizardContext::replaceFields(m_context->baseReplacements, &defaultText);
- if (ped.pathChooser->path() != ped.defaultText)
- ped.userChange = ped.pathChooser->path();
+ if (ped.pathChooser->filePath().toString() != ped.defaultText)
+ ped.userChange = ped.pathChooser->filePath().toString();
else
ped.userChange.clear();
}
@@ -435,7 +435,7 @@ CustomWizardPage::CustomWizardPage(const QSharedPointer<CustomWizardContext> &ct
QString CustomWizardPage::path() const
{
- return m_pathChooser->path();
+ return m_pathChooser->filePath().toString();
}
void CustomWizardPage::setPath(const QString &path)