diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-07 12:49:08 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 23:42:17 +0100 |
commit | a2ece6e626dcafd87e2c57a436225bc9d68128eb (patch) | |
tree | c51dbf2172b088a56dd0a239f2d1398401ecafa5 | |
parent | c5b528084ec9fe550fa5252283392c447e4d2e1b (diff) |
Disable qmacstyle test on Mac OS X
The QMacStyle is not built as part of QtWidgets at the moment (see the
TODO in src/widgets/styles/styles.pri), so disable the test for now.
I've included a comment in styles.pri to re-enable the test once the
style is done.
Change-Id: Ia6ea130135586f107ba257bf2c6c2c7187a830b6
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
-rw-r--r-- | src/widgets/styles/styles.pri | 2 | ||||
-rw-r--r-- | tests/auto/widgets/styles/styles.pro | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index dc7f622d73..cf7ee5a0a4 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -37,7 +37,7 @@ contains( styles, all ) { styles = mac windows windowsxp windowsvista } -# TODO +# TODO, re-enable qmacstyle in tests/auto/widgets/styles/sytles.pro when done styles -= mac x11{ diff --git a/tests/auto/widgets/styles/styles.pro b/tests/auto/widgets/styles/styles.pro index 7e931582db..20a59dea45 100644 --- a/tests/auto/widgets/styles/styles.pro +++ b/tests/auto/widgets/styles/styles.pro @@ -1,6 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ - qmacstyle \ +# disabled in src/widgets/styles/styles.pri, so disable the test as well +# qmacstyle \ qstyle \ qstyleoption \ qstylesheetstyle \ |