aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/tst_blackbox.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-06-01 11:23:57 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-06-01 11:23:57 +0000
commit250e6da6cb06eb7ca82fae0d98be8b4b6123cfcf (patch)
treed06c5d3628b36b4077ce6a05b41150f6a7d00583 /tests/auto/blackbox/tst_blackbox.h
parent17059ccd06e56010fa0d44ebcaf0be7b85d69703 (diff)
parent6a3c4dc21c1a5831618e5604df45abe4b0545bba (diff)
Merge "Merge 1.12 into master"
Diffstat (limited to 'tests/auto/blackbox/tst_blackbox.h')
-rw-r--r--tests/auto/blackbox/tst_blackbox.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index c5dcdea8f..af95e12a6 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -52,6 +52,7 @@ private slots:
void autotests();
void auxiliaryInputsFromDependencies();
void badInterpreter();
+ void bomSources();
void buildDataOfDisabledProduct();
void buildDirectories();
void buildEnvChange();
@@ -162,6 +163,7 @@ private slots:
void loadableModule();
void localDeployment();
void makefileGenerator();
+ void maximumCLanguageVersion();
void maximumCxxLanguageVersion();
void minimumSystemVersion();
void minimumSystemVersion_data();
@@ -208,6 +210,7 @@ private slots:
void properQuoting();
void propertiesInExportItems();
void pseudoMultiplexing();
+ void qbsConfig();
void qbsVersion();
void qtBug51237();
void radAfterIncompleteBuild();