kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #378 from wwmayer/qt5_port

Browse Source 
Qt5 port
This commit is contained in:
wwmayer
2016-12-14 09:37:35 +01:00
committed by GitHub
parent 411e30bffd deddc4b3e2
commit e5c6bf5bbd
33 changed files with 488 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Path/Gui/CMakeLists.txt
View File

@@ -25,7 +25,11 @@ set(PathGui_LIBS
FreeCADGui
)
qt4_add_resources(PathResource_SRCS Resources/Path.qrc)
if(BUILD_QT5)
qt5_add_resources(PathResource_SRCS Resources/Path.qrc)
else()
qt4_add_resources(PathResource_SRCS Resources/Path.qrc)
endif()
SOURCE_GROUP("Resources" FILES ${PathResource_SRCS})
@@ -43,7 +47,12 @@ set(PathGui_UIC_SRCS
TaskDlgPathCompound.ui
DlgProcessorChooser.ui
)
qt4_wrap_ui(PathGui_UIC_HDRS ${PathGui_UIC_SRCS})
if(BUILD_QT5)
qt5_wrap_ui(PathGui_UIC_HDRS ${PathGui_UIC_SRCS})
else()
qt4_wrap_ui(PathGui_UIC_HDRS ${PathGui_UIC_SRCS})
endif()
SET(PathGui_SRCS_Module
Command.cpp