diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
| commit | 9d174f13e48730ac06aa429e0f011a02b333025e (patch) | |
| tree | 6075fa3c24880dd6fc548f03395a5809739f67de /tests/benchmarks/qtwidgets/qtwidgets.pro | |
| parent | 4790ab735f96a13027e7292ff5b49195224f0af9 (diff) | |
| parent | e024cc10a97b9518b2dd577175feb66258d7ac05 (diff) | |
| download | Qt-9d174f13e48730ac06aa429e0f011a02b333025e.zip Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.gz Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'tests/benchmarks/qtwidgets/qtwidgets.pro')
| -rw-r--r-- | tests/benchmarks/qtwidgets/qtwidgets.pro | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/benchmarks/qtwidgets/qtwidgets.pro b/tests/benchmarks/qtwidgets/qtwidgets.pro deleted file mode 100644 index ad5e7ac..0000000 --- a/tests/benchmarks/qtwidgets/qtwidgets.pro +++ /dev/null @@ -1,9 +0,0 @@ -load(qttest_p4) - -SOURCES += tst_qtwidgets.cpp mainwindow.cpp -HEADERS += mainwindow.h -QT += network -RESOURCES = qtstyles.qrc -FORMS += advanced.ui system.ui standard.ui - - |