diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
| commit | e5913012f44843bd8f7a6cc28de5de87f134aa65 (patch) | |
| tree | 9acb7897440aec8eec7e926cb160c59a8fed78d2 /tests/auto/qstyle/tst_qstyle.cpp | |
| parent | 761b2fec23a17ea523cbd78beb2731526ea19891 (diff) | |
| parent | 7aa2d76dfc4a107f38c5cb0aac00a0b31d0fbbb6 (diff) | |
| download | Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.zip Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.gz Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/api/qscriptable.cpp
src/script/api/qscriptable_p.h
src/script/qscriptclassdata.cpp
Diffstat (limited to 'tests/auto/qstyle/tst_qstyle.cpp')
| -rw-r--r-- | tests/auto/qstyle/tst_qstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 2cb5080..3c63a50 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -351,7 +351,7 @@ void tst_QStyle::testAllFunctions(QStyle *style) testScrollBarSubControls(style); } -void tst_QStyle::testScrollBarSubControls(QStyle *) +void tst_QStyle::testScrollBarSubControls(QStyle* style) { #ifdef Q_OS_WINCE_WM if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone()) |