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.bb10
commit
240e35ddeb
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ symbian*: {
|
|||
DEPLOYMENT += testData
|
||||
}
|
||||
|
||||
QT += xml svg
|
||||
QT += xml svg core-private gui-private
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue