Commit 3debd708 authored by Victor Poughon's avatar Victor Poughon

ENH: remove Qt5Svg dependency

parent 400601c3
......@@ -20,15 +20,14 @@
project( OTBQt )
set( OTBQt_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5Svg_LIBRARIES})
set( OTBQt_SYSTEM_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} ${Qt5Svg_INCLUDE_DIRS})
set( OTBQt_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES})
set( OTBQt_SYSTEM_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} )
set( OTBQt_EXPORT_CODE_BUILD
"find_package(Qt5Core REQUIRED HINTS ${Qt5Core_DIR})
find_package(Qt5Gui REQUIRED HINTS ${Qt5Gui_DIR})
find_package(Qt5Widgets REQUIRED HINTS ${Qt5Widgets_DIR})
find_package(Qt5OpenGL REQUIRED HINTS ${Qt5OpenGL_DIR})
find_package(Qt5LinguistTools HINTS ${Qt5LinguistTools_DIR})
find_package(Qt5Svg REQUIRED HINTS ${Qt5Svg_DIR})
")
set( OTBQt_EXPORT_CODE_INSTALL ${OTBQt_EXPORT_CODE_BUILD})
......
......@@ -23,7 +23,6 @@ find_package(Qt5Gui REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5OpenGL REQUIRED)
find_package(Qt5LinguistTools)
find_package(Qt5Svg REQUIRED)
mark_as_advanced( QT_QMAKE_EXECUTABLE )
set(QT_VERSION_STRING ${Qt5Core_VERSION})
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>../../../../Utilities/Data/Icons/mIconClearText.svg</file>
<file>../../../../Utilities/Data/Icons/mIconClearTextHover.svg</file>
<file>../../../../Utilities/Data/Icons/mIconClearText.png</file>
<file>../../../../Utilities/Data/Icons/mIconClearTextHover.png</file>
</qresource>
</RCC>
......@@ -33,8 +33,8 @@ QtWidgetLineEdit::QtWidgetLineEdit( QWidget *parent )
: QLineEdit( parent )
{
// Setup the clear button icon
m_ClearIcon.addPixmap( QIcon(":/Utilities/Data/Icons/mIconClearText.svg").pixmap( QSize( CLEAR_ICON_SIZE, CLEAR_ICON_SIZE)), QIcon::Normal, QIcon::On );
m_ClearIcon.addPixmap( QIcon(":/Utilities/Data/Icons/mIconClearTextHover.svg").pixmap( QSize( CLEAR_ICON_SIZE, CLEAR_ICON_SIZE)) , QIcon::Selected, QIcon::On );
m_ClearIcon.addPixmap( QIcon(":/Utilities/Data/Icons/mIconClearText.png").pixmap( QSize( CLEAR_ICON_SIZE, CLEAR_ICON_SIZE)), QIcon::Normal, QIcon::On );
m_ClearIcon.addPixmap( QIcon(":/Utilities/Data/Icons/mIconClearTextHover.png").pixmap( QSize( CLEAR_ICON_SIZE, CLEAR_ICON_SIZE)) , QIcon::Selected, QIcon::On );
}
void QtWidgetLineEdit::EnableClearButton()
......
......@@ -91,6 +91,7 @@ set(QT5_SB_CONFIG
-skip qtserialbus \
-skip qtserialport \
-skip qtspeech \
-skip qtsvg \
-skip qtvirtualkeyboard \
-skip qtwayland \
-skip qtwebchannel \
......
<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
<path d="m4.6303139 3l-3.6303139 5 3.6303139 5h9.3696861v-10h-.175755z" fill="#969696" overflow="visible"/>
<path d="m5.9226862 10.69629l5.7783958-5.4230039" fill="none" stroke="#fff"/>
<path d="m5.9226862 5.2732861l5.7783958 5.4230039" fill="none" stroke="#fff"/>
</svg>
<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
<path d="m4.6303139 3l-3.6303139 5 3.6303139 5h9.3696861v-10h-.175755z" fill="#666" overflow="visible"/>
<path d="m5.9226862 10.69629l5.7783958-5.4230039" fill="none" stroke="#fff"/>
<path d="m5.9226862 5.2732861l5.7783958 5.4230039" fill="none" stroke="#fff"/>
</svg>
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