Commit 8fd76fbc authored by Jan Möbius's avatar Jan Möbius

Dropped QWT5 and removed more qt4 references

parent c37a16f0
......@@ -95,9 +95,6 @@ if ( EXISTS ${BRANDING_DIRECTORY}/branding.qrc )
if ( QT5_FOUND )
QT5_ADD_RESOURCES(BRANDING_RC_SRC "${BRANDING_DIRECTORY}/branding.qrc")
list(APPEND RC_SRC ${BRANDING_RC_SRC})
else()
QT4_ADD_RESOURCES(BRANDING_RC_SRC "${BRANDING_DIRECTORY}/branding.qrc")
list(APPEND RC_SRC ${BRANDING_RC_SRC})
endif()
endif()
......@@ -203,7 +200,7 @@ if ( NOT found EQUAL -1 )
endif()
# use Qwt6 for QT5
if (NOT FORCE_QT4 AND QT5_FOUND)
if (QT5_FOUND)
find_package(Qwt6)
if (QWT6_FOUND)
......@@ -211,14 +208,7 @@ if (NOT FORCE_QT4 AND QT5_FOUND)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${QWT6_INCLUDE_DIRS} )
set(COREAPP_ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${QWT6_LIBRARIES})
endif()
else()
find_package(Qwt5)
if(Qwt5_Qt4_FOUND)
add_definitions(-DWITH_QWT)
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Qwt5_INCLUDE_DIR} )
set(COREAPP_ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
endif()
endif()
......
......@@ -149,9 +149,6 @@ acg_drop_templates (sources)
if (QT5_FOUND)
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
elseif (QT4_FOUND)
acg_qt4_autouic (uic_targets ${ui})
acg_qt4_automoc (moc_targets ${headers})
endif ()
#=======================================================
......@@ -161,8 +158,6 @@ RECURSE_GROUPS( ${CMAKE_CURRENT_SOURCE_DIR}/../../ )
if (QT5_FOUND)
acg_add_library (OpenFlipperPluginLib SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
elseif (QT4_FOUND)
acg_add_library (OpenFlipperPluginLib SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
endif ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment