remove deprecated FileTagger.pattern

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

1 files changed, 4 insertions, 14 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index fec042e1e..f95332d82 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -710,24 +710,14 @@ void ProjectResolver::resolveFileTagger(Item *item, ProjectContext *projectConte
     checkCancelation();
     QList<FileTaggerConstPtr> &fileTaggers = m_productContext
             ? m_productContext->product->fileTaggers : projectContext->fileTaggers;
-    QStringList patterns = m_evaluator->stringListValue(item, QLatin1String("patterns"));
+    const QStringList patterns = m_evaluator->stringListValue(item, QLatin1String("patterns"));
+    if (patterns.isEmpty())
+        throw ErrorInfo(Tr::tr("FileTagger.patterns must be a non-empty list."), item->location());
+
     const FileTags fileTags = m_evaluator->fileTagsValue(item, QLatin1String("fileTags"));
     if (fileTags.isEmpty())
         throw ErrorInfo(Tr::tr("FileTagger.fileTags must not be empty."), item->location());
 
-    // TODO: Remove in 1.3.
-    bool patternWasSet;
-    const QStringList oldPatterns = m_evaluator->stringListValue(item, QLatin1String("pattern"),
-                                                                 &patternWasSet);
-    if (patternWasSet) {
-        m_logger.printWarning(ErrorInfo(Tr::tr("The 'pattern' property is deprecated. Please "
-                                               "use 'patterns' instead."), item->location()));
-        patterns << oldPatterns;
-    }
-
-    if (patterns.isEmpty())
-        throw ErrorInfo(Tr::tr("FileTagger.patterns must be a non-empty list."), item->location());
-
     foreach (const QString &pattern, patterns) {
         if (pattern.isEmpty())
             throw ErrorInfo(Tr::tr("A FileTagger pattern must not be empty."), item->location());