summaryrefslogtreecommitdiff
path: root/library/qpeapplication.cpp
Side-by-side diff
Diffstat (limited to 'library/qpeapplication.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 28fb13a..feba8b6 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1126,3 +1126,4 @@ void QPEApplication::applyStyle()
- #if QT_VERSION > 233
+#if QT_VERSION > 233
+#if !defined(OPIE_NO_OVERRIDE_QT)
// don't block ourselves ...
@@ -1140,2 +1141,5 @@ void QPEApplication::applyStyle()
}
+#else
+ int nostyle = 0;
+#endif
@@ -1196,2 +1200,3 @@ void QPEApplication::applyStyle()
+#if !defined(OPIE_NO_OVERRIDE_QT)
// revert to global blocking policy ...
@@ -1199,3 +1204,4 @@ void QPEApplication::applyStyle()
Opie::force_appearance &= ~nostyle;
- #endif
+#endif
+#endif
}