remove legacy .qbp file support

Change-Id: I18c819d4e4bbfba16ca0522247ebf9fbc6ac6ae4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 1 insertions, 8 deletions

diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index c81d267ef..083339042 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -438,9 +438,8 @@ void CommandLineParser::CommandLineParserPrivate::setupProjectFile()
     if (!projectFileInfo.isDir())
         throw ErrorInfo(Tr::tr("Project file '%1' has invalid type.").arg(projectFilePath));
 
-    // TODO: Remove check for '.qbp' in 1.1
     const QStringList namePatterns = QStringList()
-            << QLatin1String("*.qbp") << QLatin1String("*.qbs");
+            << QLatin1String("*.qbs");
 
     const QStringList &actualFileNames
             = QDir(projectFilePath).entryList(namePatterns, QDir::Files);
@@ -463,11 +462,6 @@ void CommandLineParser::CommandLineParserPrivate::setupProjectFile()
     projectFilePath = QDir::current().filePath(projectFilePath);
     projectFilePath = QDir::cleanPath(projectFilePath);
 
-    // TODO: Remove in 1.1
-    if (projectFilePath.endsWith(QLatin1String(".qbp")))
-        qbsInfo() << Tr::tr("Your main project file has the old suffix '.qbp'. This does not "
-                        "hurt, but the convention is now to use '.qbs'.");
-
     qbsDebug() << "Using project file '" << QDir::toNativeSeparators(projectFilePath) << "'.";
 }
 
diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp
index 303ea485c..de979011f 100644
--- a/src/app/qbs/status.cpp
+++ b/src/app/qbs/status.cpp
@@ -46,7 +46,6 @@ static QList<QRegExp> createIgnoreList(const QString &projectRootPath)
     QList<QRegExp> ignoreRegularExpressionList;
     ignoreRegularExpressionList.append(QRegExp(projectRootPath + "/build.*"));
     ignoreRegularExpressionList.append(QRegExp("*.qbs", Qt::CaseSensitive, QRegExp::Wildcard));
-    ignoreRegularExpressionList.append(QRegExp("*.qbp", Qt::CaseSensitive, QRegExp::Wildcard));
     ignoreRegularExpressionList.append(QRegExp("*.pro", Qt::CaseSensitive, QRegExp::Wildcard));
     ignoreRegularExpressionList.append(QRegExp("*Makefile", Qt::CaseSensitive, QRegExp::Wildcard));
     ignoreRegularExpressionList.append(QRegExp("*.so*", Qt::CaseSensitive, QRegExp::Wildcard));