summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/widgets/styles/styles.pri2
-rw-r--r--tests/auto/widgets/styles/styles.pro3
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 \