#colorselector: fix osx build

morevnaproject-org · Jan 25, 2018 · 74ee770 · 74ee770
1 parent cce0209
commit 74ee770
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/thirdparty/qt-color-widgets/src/advanced_color_selector.cpp b/thirdparty/qt-color-widgets/src/advanced_color_selector.cpp
@@ -205,10 +205,10 @@ class AdvancedColorSelector::Private : public QObject
         color_history->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
         auto config_menu_button = new QToolButton();
-        config_menu_button->setDefaultAction(new QAction(QIcon::fromTheme("configure"), "Configure"));
+        config_menu_button->setDefaultAction(new QAction(QIcon::fromTheme("configure"), "Configure", nullptr));
         config_menu_button->setPopupMode(QToolButton::InstantPopup);
         auto config_menu = new QMenu();
-        auto enable_rgb_action = new QAction("RGB sliders");
+        auto enable_rgb_action = new QAction("RGB sliders", nullptr);
         enable_rgb_action->setCheckable(true);
         connect(enable_rgb_action, &QAction::toggled, [this](bool show) {
             rgb_chooser->setVisible(show);

diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt
@@ -421,6 +421,8 @@ elseif(BUILD_ENV_APPLE)
     # 変なところにライブラリ生成するカスども
     set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
 
+    set(EXTRA_LIBS ${EXTRA_LIBS} ${CMAKE_CURRENT_BINARY_DIR}/../qt-color-widgets/libColorWidgets-qt5.dylib)
+
     add_dependencies(OpenToonz_${VERSION} tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm)
 
     target_link_libraries(OpenToonz_${VERSION}