diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
| commit | 1d7d5436eea09a232187836e59d2a937a752dee4 (patch) | |
| tree | 6bd9ae61abb1467aceddc5a828fc2e65d93b2534 /tests/arthur/lance/lance.pro | |
| parent | 791bddfcd5cc7540219835ef5d91486acd833c4b (diff) | |
| parent | fb8bb148affec842e8fa1a70616c64c7d3066ee8 (diff) | |
| download | Qt-1d7d5436eea09a232187836e59d2a937a752dee4.zip Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.gz Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/qscriptextqobject.cpp
Diffstat (limited to 'tests/arthur/lance/lance.pro')
| -rw-r--r-- | tests/arthur/lance/lance.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro index 193dbd2..ee9e08b 100644 --- a/tests/arthur/lance/lance.pro +++ b/tests/arthur/lance/lance.pro @@ -6,7 +6,7 @@ INCLUDEPATH += . # Input HEADERS += widgets.h interactivewidget.h -SOURCES += interactivewidget.cpp main.cpp +SOURCES += interactivewidget.cpp main.cpp RESOURCES += icons.qrc contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl |