From e151381a8a0ad4799e21656853b0738b60ae58af Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 22 Nov 2010 18:05:49 +0100 Subject: [PATCH] Git: Allow . in checkout pathes Task-number: QTCREATORBUG-3141 --- src/plugins/git/clonewizardpage.cpp | 2 +- src/plugins/vcsbase/basecheckoutwizardpage.cpp | 4 ++-- src/plugins/vcsbase/basecheckoutwizardpage.ui | 7 +------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp index 644ec060b7e..4252f297cb6 100644 --- a/src/plugins/git/clonewizardpage.cpp +++ b/src/plugins/git/clonewizardpage.cpp @@ -128,7 +128,7 @@ QString CloneWizardPage::directoryFromRepository(const QString &urlIn) const } // fix invalid characters const QChar dash = QLatin1Char('-'); - url.replace(QRegExp(QLatin1String("[^0-9a-zA-Z_-]")), dash); + url.replace(QRegExp(QLatin1String("[^0-9a-zA-Z_.-]")), dash); // trim leading dashes (they are annoying and get created when using local pathes) url.replace(QRegExp(QLatin1String("^-+")), QString()); return url; diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.cpp b/src/plugins/vcsbase/basecheckoutwizardpage.cpp index b575e839492..7d2afba2750 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.cpp +++ b/src/plugins/vcsbase/basecheckoutwizardpage.cpp @@ -50,7 +50,7 @@ BaseCheckoutWizardPage::BaseCheckoutWizardPage(QWidget *parent) : connect(d->ui.repositoryLineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotRepositoryChanged(QString))); - connect(d->ui.checkoutDirectoryLineEdit, SIGNAL(validChanged()), + connect(d->ui.checkoutDirectoryLineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotChanged())); connect(d->ui.checkoutDirectoryLineEdit, SIGNAL(textEdited(QString)), this, SLOT(slotDirectoryEdited())); connect(d->ui.branchComboBox, SIGNAL(currentIndexChanged(int)), @@ -87,7 +87,7 @@ void BaseCheckoutWizardPage::addRepositoryControl(QWidget *w) bool BaseCheckoutWizardPage::checkIsValid() const { return d->ui.pathChooser->isValid() - && d->ui.checkoutDirectoryLineEdit->isValid() + && !d->ui.checkoutDirectoryLineEdit->text().isEmpty() && !d->ui.repositoryLineEdit->text().isEmpty(); } diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.ui b/src/plugins/vcsbase/basecheckoutwizardpage.ui index f94995ccdf2..46a58348e4e 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.ui +++ b/src/plugins/vcsbase/basecheckoutwizardpage.ui @@ -112,7 +112,7 @@ - + The local directory that will contain the code after the checkout. @@ -140,11 +140,6 @@ - - Utils::ProjectNameValidatingLineEdit - QLineEdit -
utils/projectnamevalidatinglineedit.h
-
Utils::PathChooser QLineEdit