Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Ben Boeckel
ParaView
Commits
ecb5d4b7
Commit
ecb5d4b7
authored
Jul 14, 2015
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt: support Qt 5.5's class movements
QtDeclarative seems to be dissolving.
parent
ddde1bfa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
CMake/ParaViewQt5.cmake
CMake/ParaViewQt5.cmake
+5
-0
Qt/Core/CMakeLists.txt
Qt/Core/CMakeLists.txt
+1
-0
Qt/Core/pqFormBuilder.cxx
Qt/Core/pqFormBuilder.cxx
+4
-0
No files found.
CMake/ParaViewQt5.cmake
View file @
ecb5d4b7
...
...
@@ -30,6 +30,11 @@ IF( NOT Qt5_FIND_COMPONENTS )
Widgets
Xml
)
if
(
NOT Qt5Core_VERSION_STRING VERSION_LESS
"5.5.0"
)
list
(
APPEND Qt5_FIND_COMPONENTS
UiPlugin
)
endif
()
ENDIF
()
IF
(
Qt5Core_FOUND
)
...
...
Qt/Core/CMakeLists.txt
View file @
ecb5d4b7
...
...
@@ -333,6 +333,7 @@ if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
set
(
${
vtk-module
}
_INCLUDE_DIRS
${
Qt5Widgets_INCLUDE_DIRS
}
${
Qt5UiTools_INCLUDE_DIRS
}
${
Qt5UiPlugin_INCLUDE_DIRS
}
${
Qt5Xml_INCLUDE_DIRS
}
)
else
()
# import Qt4 build settings
...
...
Qt/Core/pqFormBuilder.cxx
View file @
ecb5d4b7
...
...
@@ -33,7 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pqFormBuilder.h"
#include <QtDesigner/QDesignerCustomWidgetInterface>
#if QT_VERSION >= 0x050500
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
#endif
#include <QPluginLoader>
#include <QCoreApplication>
#include <QWidget>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment