diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:18:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:18:56 +1000 |
| commit | 240e35ddeb6a71c99bcef53eccee206b02d72d85 (patch) | |
| tree | 3d765109a5ec53cac23f011677debec178b60005 | |
| parent | ff08e8c009323eadd3df79100979cbb937d8e1e3 (diff) | |
| parent | 66498850f2d5cf3a41579323c5119a7b6c9ce830 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Allow arthur tests to use private headers.
| -rw-r--r-- | tests/arthur/datagenerator/datagenerator.pro | 2 | ||||
| -rw-r--r-- | tests/arthur/htmlgenerator/htmlgenerator.pro | 2 | ||||
| -rw-r--r-- | tests/arthur/lance/lance.pro | 2 | ||||
| -rw-r--r-- | tests/arthur/performancediff/performancediff.pro | 2 | ||||
| -rw-r--r-- | tests/arthur/shower/shower.pro | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/arthur/datagenerator/datagenerator.pro b/tests/arthur/datagenerator/datagenerator.pro index 114e81a795..2c320a3418 100644 --- a/tests/arthur/datagenerator/datagenerator.pro +++ b/tests/arthur/datagenerator/datagenerator.pro @@ -8,7 +8,7 @@ DEPENDPATH += . INCLUDEPATH += . DESTDIR = ../bin -QT += svg xml +QT += svg xml core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl # Input diff --git a/tests/arthur/htmlgenerator/htmlgenerator.pro b/tests/arthur/htmlgenerator/htmlgenerator.pro index 81c538fba6..4f5d5c8c16 100644 --- a/tests/arthur/htmlgenerator/htmlgenerator.pro +++ b/tests/arthur/htmlgenerator/htmlgenerator.pro @@ -9,7 +9,7 @@ DESTDIR = ../bin CONFIG += console -QT += svg xml +QT += svg xml core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl # Input diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro index cff431309f..8f3407cfc9 100644 --- a/tests/arthur/lance/lance.pro +++ b/tests/arthur/lance/lance.pro @@ -17,6 +17,6 @@ symbian*: { DEPLOYMENT += testData } -QT += xml svg +QT += xml svg core-private gui-private diff --git a/tests/arthur/performancediff/performancediff.pro b/tests/arthur/performancediff/performancediff.pro index e79017c364..8c1fb98047 100644 --- a/tests/arthur/performancediff/performancediff.pro +++ b/tests/arthur/performancediff/performancediff.pro @@ -9,7 +9,7 @@ DESTDIR = ../bin CONFIG += console -QT += xml svg +QT += xml svg core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl # Input diff --git a/tests/arthur/shower/shower.pro b/tests/arthur/shower/shower.pro index 1f2ce22af2..f4f8d47809 100644 --- a/tests/arthur/shower/shower.pro +++ b/tests/arthur/shower/shower.pro @@ -7,7 +7,7 @@ DEPENDPATH += . INCLUDEPATH += . DESTDIR = ../bin -QT += xml svg +QT += xml svg core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl # Input |