2016-06-22 05:54:02 +00:00
|
|
|
--- ParaView-v5.1.0_old/CMake/branded_paraview_main.cxx.in 2016-06-18 11:39:09.000000000 -0400
|
|
|
|
|
+++ ParaView-v5.1.0/CMake/branded_paraview_main.cxx.in 2016-06-21 08:01:39.384393053 -0400
|
|
|
|
|
@@ -72,15 +72,15 @@
|
2011-04-20 08:24:25 +00:00
|
|
|
|
|
|
|
|
int main(int argc, char* argv[])
|
|
|
|
|
{
|
2016-06-22 05:54:02 +00:00
|
|
|
-#if defined(Q_WS_X11) || defined(Q_OS_LINUX)
|
|
|
|
|
+// #if defined(Q_WS_X11) || defined(Q_OS_LINUX)
|
2011-04-20 08:24:25 +00: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
|
2016-06-22 05:54:02 +00:00
|
|
|
|
|
|
|
|
// "plastique" is only available on Qt4, but this works just fine with Qt5 too. Qt5 just uses the
|
|
|
|
|
// default style when QStyleFactory::create("plastique") return nullptr.
|
|
|
|
|
- QApplication::setStyle(QStyleFactory::create("plastique"));
|
2011-04-20 08:24:25 +00:00
|
|
|
-#endif
|
2016-06-22 05:54:02 +00:00
|
|
|
+// QApplication::setStyle(QStyleFactory::create("plastique"));
|
2014-02-04 09:39:54 +00:00
|
|
|
+// #endif
|
2011-04-20 08:24:25 +00:00
|
|
|
|
|
|
|
|
// When playing tests, disable all effects.
|
2014-02-04 09:39:54 +00:00
|
|
|
if (checkenv("DART_TEST_FROM_DART") ||
|
