2014-09-11 10:57:03 +02:00
|
|
|
Index: ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in
|
2014-02-04 10:39:54 +01:00
|
|
|
===================================================================
|
2014-09-11 10:57:03 +02:00
|
|
|
--- ParaView-v4.2.0-RC1-source.orig/CMake/branded_paraview_main.cxx.in
|
|
|
|
|
+++ ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in
|
|
|
|
|
@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
|
|
|
|
|
#endif
|
2011-04-20 10:24:25 +02:00
|
|
|
|
|
|
|
|
#ifdef Q_WS_X11
|
|
|
|
|
-#include <QPlastiqueStyle>
|
|
|
|
|
+#include <QStyle>
|
|
|
|
|
#endif
|
|
|
|
|
|
2014-02-04 10:39:54 +01:00
|
|
|
#include <stdlib.h>
|
2014-09-11 10:57:03 +02:00
|
|
|
@@ -72,12 +72,12 @@ static bool checkenv(const char* vname)
|
2011-04-20 10:24:25 +02:00
|
|
|
|
|
|
|
|
int main(int argc, char* argv[])
|
|
|
|
|
{
|
|
|
|
|
-#ifdef Q_WS_X11
|
2014-02-04 10:39:54 +01:00
|
|
|
+// #ifdef Q_WS_X11
|
2011-04-20 10:24:25 +02:00
|
|
|
// Using motif style gives us test failures (and its ugly).
|
|
|
|
|
// Using cleanlooks style gives us errors when using valgrind (Trolltech's bug #179200)
|
|
|
|
|
// let's just use plastique for now
|
|
|
|
|
- QApplication::setStyle(new QPlastiqueStyle);
|
|
|
|
|
-#endif
|
2014-02-04 10:39:54 +01:00
|
|
|
+ // QApplication::setStyle(new QPlastiqueStyle);
|
|
|
|
|
+// #endif
|
2011-04-20 10:24:25 +02:00
|
|
|
|
|
|
|
|
// When playing tests, disable all effects.
|
2014-02-04 10:39:54 +01:00
|
|
|
if (checkenv("DART_TEST_FROM_DART") ||
|
