diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:18:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:18:02 (GMT) |
| commit | 27e403d9c6185c606980bb7881e39a2c88138a13 (patch) | |
| tree | 5abe2f83832f9c2a7b3ef1804f4a79d89fa8b831 /tests/auto/declarative/qmltimer/qmltimer.pro | |
| parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
| parent | 67bb989e11cf47431e419966bff7257c028ea958 (diff) | |
| download | Qt-27e403d9c6185c606980bb7881e39a2c88138a13.zip Qt-27e403d9c6185c606980bb7881e39a2c88138a13.tar.gz Qt-27e403d9c6185c606980bb7881e39a2c88138a13.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (139 commits)
Fixed qdeclarativeconnection test.
missed rename
Revert "Some animation cleanup/refactoring."
Rename files to follow class name.
Change Connection syntax as per QT-2822.
Doc
update painted geometry on pixmapChanged rather than sourceChanged
Make Flickable overshoot behavior nicer.
Polish QDeclarativeProperty API
Test, demo, and work-around bug QTBUG-8535
Fix ParentAnimation crash.
Tiny doc tweak.
Work around requires() bug in qmake
Make sure that QEasingCurve::type when streamed is a quint8, as documented
Add QEasingCurve to datastream format docs
Move QEasingCurve datastream autotest to qdatastream for more comprehensive tests
Some animation cleanup/refactoring.
Fix Flickable.overShoot doc - it is a bool not a real
Rebuild since -declarative auto detection changed.
Renamed Flickable viewportXXX properties contentXXX
...
Diffstat (limited to 'tests/auto/declarative/qmltimer/qmltimer.pro')
| -rw-r--r-- | tests/auto/declarative/qmltimer/qmltimer.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/declarative/qmltimer/qmltimer.pro b/tests/auto/declarative/qmltimer/qmltimer.pro deleted file mode 100644 index 2b244ed..0000000 --- a/tests/auto/declarative/qmltimer/qmltimer.pro +++ /dev/null @@ -1,7 +0,0 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui -macx:CONFIG -= app_bundle - -SOURCES += tst_qmltimer.cpp - -DEFINES += SRCDIR=\\\"$$PWD\\\" |