Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
SUITApp
/
SUITApp_Application.h
diff --git
a/src/SUITApp/SUITApp_Application.h
b/src/SUITApp/SUITApp_Application.h
index 7491d55a6e27c9415ea92efcbcd422984d9be978..2941f9cdc1552a191ed04437141830e0512923be 100644
(file)
--- a/
src/SUITApp/SUITApp_Application.h
+++ b/
src/SUITApp/SUITApp_Application.h
@@
-43,8
+43,10
@@
class SUITAPP_EXPORT SUITApp_Application : public QApplication
public:
SUITApp_Application( int&, char**, SUIT_ExceptionHandler* = 0 );
public:
SUITApp_Application( int&, char**, SUIT_ExceptionHandler* = 0 );
+// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
SUITApp_Application( int&, char**, Type, SUIT_ExceptionHandler* = 0 );
SUITApp_Application( int&, char**, Type, SUIT_ExceptionHandler* = 0 );
-
+#endif
virtual bool notify( QObject* receiver, QEvent* e );
SUIT_ExceptionHandler* handler() const;
virtual bool notify( QObject* receiver, QEvent* e );
SUIT_ExceptionHandler* handler() const;