Skip to content

Commit ba10613

Browse files
committed
Merged branch 'advanced_color_selector' from caryoscelus w/ conflicts resolved
2 parents 675c128 + 6c4bc7d commit ba10613

File tree

95 files changed

+3
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+3
-3
lines changed
File renamed without changes.

toonz/sources/Qt-Color-Widgets/CMakeLists.txt renamed to thirdparty/Qt-Color-Widgets/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ qt5_wrap_ui(SOURCES src/color_dialog.ui src/color_palette_widget.ui)
101101
qt5_add_resources(SOURCES src/color_widgets.qrc)
102102

103103
# Library
104-
add_library(${COLOR_WIDGETS_LIBRARY} ${SOURCES})
104+
add_library(${COLOR_WIDGETS_LIBRARY} SHARED ${SOURCES})
105105
target_link_libraries(${COLOR_WIDGETS_LIBRARY} Qt5::Widgets)
106106

107107
add_definitions(-DQTCOLORWIDGETS_LIBRARY)
File renamed without changes.

0 commit comments

Comments
 (0)