From 6f59926e670d68b27a387651a466f47ca9e8fd37 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Tue, 24 May 2016 16:16:56 +0200
Subject: [PATCH] qtestblacklist: check against duplicating versioned distro

Also check the version is non-empty.
Probably makes no difference, but it's obviously more correct.

Change-Id: I05eee5623ac432d2ea02f7aad874513beeb2ceeb
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 src/testlib/qtestblacklist.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index da98b88989..9300cb58af 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -144,7 +144,11 @@ static QSet<QByteArray> activeConditions()
     if (!distributionName.isEmpty()) {
         if (result.find(distributionName) == result.end())
             result.insert(distributionName);
-        result.insert(distributionName + "-" + distributionRelease);
+        if (!distributionRelease.isEmpty()) {
+            QByteArray versioned = distributionName + "-" + distributionRelease;
+            if (result.find(versioned) == result.end())
+                result.insert(versioned);
+        }
     }
 
     return result;