Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
3debd708
Commit
3debd708
authored
Jun 07, 2018
by
Victor Poughon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: remove Qt5Svg dependency
parent
400601c3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
7 additions
and
18 deletions
+7
-18
Modules/ThirdParty/Qt/CMakeLists.txt
Modules/ThirdParty/Qt/CMakeLists.txt
+2
-3
Modules/ThirdParty/Qt/otb-module-init.cmake
Modules/ThirdParty/Qt/otb-module-init.cmake
+0
-1
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetIcons.qrc
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetIcons.qrc
+2
-2
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSpinBoxes.cxx
...les/Wrappers/QtWidget/src/otbWrapperQtWidgetSpinBoxes.cxx
+2
-2
SuperBuild/CMake/External_qt5.cmake
SuperBuild/CMake/External_qt5.cmake
+1
-0
Utilities/Data/Icons/mIconClearText.png
Utilities/Data/Icons/mIconClearText.png
+0
-0
Utilities/Data/Icons/mIconClearText.svg
Utilities/Data/Icons/mIconClearText.svg
+0
-5
Utilities/Data/Icons/mIconClearTextHover.png
Utilities/Data/Icons/mIconClearTextHover.png
+0
-0
Utilities/Data/Icons/mIconClearTextHover.svg
Utilities/Data/Icons/mIconClearTextHover.svg
+0
-5
No files found.
Modules/ThirdParty/Qt/CMakeLists.txt
View file @
3debd708
...
...
@@ -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
}
)
...
...
Modules/ThirdParty/Qt/otb-module-init.cmake
View file @
3debd708
...
...
@@ -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
}
)
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetIcons.qrc
View file @
3debd708
<!DOCTYPE RCC>
<RCC
version=
"1.0"
>
<qresource>
<file>
../../../../Utilities/Data/Icons/mIconClearText.
sv
g
</file>
<file>
../../../../Utilities/Data/Icons/mIconClearTextHover.
sv
g
</file>
<file>
../../../../Utilities/Data/Icons/mIconClearText.
pn
g
</file>
<file>
../../../../Utilities/Data/Icons/mIconClearTextHover.
pn
g
</file>
</qresource>
</RCC>
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSpinBoxes.cxx
View file @
3debd708
...
...
@@ -33,8 +33,8 @@ QtWidgetLineEdit::QtWidgetLineEdit( QWidget *parent )
:
QLineEdit
(
parent
)
{
// Setup the clear button icon
m_ClearIcon
.
addPixmap
(
QIcon
(
":/Utilities/Data/Icons/mIconClearText.
sv
g"
).
pixmap
(
QSize
(
CLEAR_ICON_SIZE
,
CLEAR_ICON_SIZE
)),
QIcon
::
Normal
,
QIcon
::
On
);
m_ClearIcon
.
addPixmap
(
QIcon
(
":/Utilities/Data/Icons/mIconClearTextHover.
sv
g"
).
pixmap
(
QSize
(
CLEAR_ICON_SIZE
,
CLEAR_ICON_SIZE
))
,
QIcon
::
Selected
,
QIcon
::
On
);
m_ClearIcon
.
addPixmap
(
QIcon
(
":/Utilities/Data/Icons/mIconClearText.
pn
g"
).
pixmap
(
QSize
(
CLEAR_ICON_SIZE
,
CLEAR_ICON_SIZE
)),
QIcon
::
Normal
,
QIcon
::
On
);
m_ClearIcon
.
addPixmap
(
QIcon
(
":/Utilities/Data/Icons/mIconClearTextHover.
pn
g"
).
pixmap
(
QSize
(
CLEAR_ICON_SIZE
,
CLEAR_ICON_SIZE
))
,
QIcon
::
Selected
,
QIcon
::
On
);
}
void
QtWidgetLineEdit
::
EnableClearButton
()
...
...
SuperBuild/CMake/External_qt5.cmake
View file @
3debd708
...
...
@@ -91,6 +91,7 @@ set(QT5_SB_CONFIG
-skip qtserialbus \
-skip qtserialport \
-skip qtspeech \
-skip qtsvg \
-skip qtvirtualkeyboard \
-skip qtwayland \
-skip qtwebchannel \
...
...
Utilities/Data/Icons/mIconClearText.png
0 → 100644
View file @
3debd708
5.79 KB
Utilities/Data/Icons/mIconClearText.svg
deleted
100644 → 0
View file @
400601c3
<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>
Utilities/Data/Icons/mIconClearTextHover.png
0 → 100644
View file @
3debd708
6.99 KB
Utilities/Data/Icons/mIconClearTextHover.svg
deleted
100644 → 0
View file @
400601c3
<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>
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