Disable KDMacTouchBar to get DMG built

Author: Cuperino

CMakeLists.txt

@@ -172,13 +172,13 @@ else()
     find_package(QHotkey 1.5.0 COMPONENTS
         QHotkey
     )
-    # KDMacTouchBar (Mac only)
-    if(APPLE AND NOT IOS)
-        if (NOT EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/KDMacTouchBar/CMakeLists.txt")
-            message(FATAL_ERROR "KDMacTouchBar was not downloaded. GIT_SUBMODULE was turned off or failed.")
-        endif()
-        add_subdirectory("3rdparty/KDMacTouchBar" build/kdmactouchbar)
-    endif()
+    # # KDMacTouchBar (Mac only)
+    # if(APPLE AND NOT IOS)
+    #     if (NOT EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/KDMacTouchBar/CMakeLists.txt")
+    #         message(FATAL_ERROR "KDMacTouchBar was not downloaded. GIT_SUBMODULE was turned off or failed.")
+    #     endif()
+    #     add_subdirectory("3rdparty/KDMacTouchBar" build/kdmactouchbar)
+    # endif()
 endif()
 
 if (WIN32 OR UNIX) # AND NOT ANDROID

src/CMakeLists.txt

@@ -387,11 +387,11 @@ endif()
 # Private header/s that would be used if QT_QMLCACHEGEN_DIRECT_CALLS were turned ON
 # - Qt${QT_VERSION_MAJOR}::QuickPrivate
 
-if(APPLE AND NOT IOS)
-    target_include_directories(mactouchbar PRIVATE ${kdmactouchbar_SOURCE_DIR}/KDMacTouchBar)
-    target_link_directories(mactouchbar PRIVATE ${kdmactouchbar_SOURCE_DIR}/KDMacTouchBar)
-    target_link_libraries(${PROJECT_NAME} PRIVATE KDMacTouchBar)
-endif()
+# if(APPLE AND NOT IOS)
+#     target_include_directories(mactouchbar PRIVATE ${kdmactouchbar_SOURCE_DIR}/KDMacTouchBar)
+#     target_link_directories(mactouchbar PRIVATE ${kdmactouchbar_SOURCE_DIR}/KDMacTouchBar)
+#     target_link_libraries(${PROJECT_NAME} PRIVATE KDMacTouchBar)
+# endif()
 if (QHotkey_FOUND)
     add_definitions(-DQHotkey_FOUND)
     target_link_libraries(${PROJECT_NAME} PRIVATE

src/main.cpp

@@ -54,9 +54,9 @@
 #include <QHotkey>
 #endif
 
-#if defined(Q_OS_MACOS)
-#include <../3rdparty/KDMacTouchBar/src/kdmactouchbar.h>
-#endif
+// #if defined(Q_OS_MACOS)
+// #include <../3rdparty/KDMacTouchBar/src/kdmactouchbar.h>
+// #endif
 
 #include "../qprompt_version.h"
 #include "abstractunits.hpp"
@@ -181,43 +181,43 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     // KirigamiPlugin::getInstance().registerTypes();
     // #endif
 
-#if defined(Q_OS_MACOS)
-    // Enable automatic display of dialog prompts on the touchbar.
-    KDMacTouchBar::setAutomaticallyCreateMessageBoxTouchBar(true);
-//    // Create touchbar for use through all of QPrompt's execusion
-//    KDMacTouchBar *touchBar = new KDMacTouchBar();
-//    //QMainWindow *mainWindow = nullptr;
-//    //foreach(QWidget *widget, app.topLevelWidgets())
-//    //    if(widget->inherits("QMainWindow")) {
-//    //        mainWindow = qobject_cast<QMainWindow *>(widget);
-//    //        break;
-//    //    };
-//    //KDMacTouchBar *touchBar = new KDMacTouchBar(mainWindow);
-//    // Toggle teleprompter state
-//    QIcon qpromptIcon(QStringLiteral(":images/qprompt"));
-//    QAction *action = new QAction(qpromptIcon, "Toggle");
-//    touchBar->addAction(action);
-//    // connect(action, &QAction::triggered, this, &MainWindow::activated);
-//    touchBar->addSeparator();
-//    // Velocity and placement toachbar controls
-//    touchBar->setTouchButtonStyle(KDMacTouchBar::IconOnly);
-//    // Up
-//    QIcon upIcon(QStringLiteral(":icons/go-previous"));
-//    QAction *reduceAction = new QAction(upIcon, "Reduce");
-//    touchBar->addAction(reduceAction);
-//    touchBar->setPrincipialAction(reduceAction);
-//    // connect(reduceAction, &QAction::triggered, this, &MainWindow::activated);
-//    // Down
-//    QIcon downIcon(QStringLiteral(":icons/go-next"));
-//    QAction *increaseAction = new QAction(downIcon, "Increase");
-//    touchBar->addAction(increaseAction);
-//    // connect(increaseAction, &QAction::triggered, this, &MainWindow::activated);
-////    touchBar->addSeparator();
-////    // Stop prompter
-////    QAction *stopAction = new QAction(upIcon, "Stop");
-////    touchBar->addAction(stopAction);
-////    // connect(stopAction, &QAction::triggered, this, &MainWindow::activated);
-#endif
+// #if defined(Q_OS_MACOS)
+//     // Enable automatic display of dialog prompts on the touchbar.
+//     KDMacTouchBar::setAutomaticallyCreateMessageBoxTouchBar(true);
+// //    // Create touchbar for use through all of QPrompt's execusion
+// //    KDMacTouchBar *touchBar = new KDMacTouchBar();
+// //    //QMainWindow *mainWindow = nullptr;
+// //    //foreach(QWidget *widget, app.topLevelWidgets())
+// //    //    if(widget->inherits("QMainWindow")) {
+// //    //        mainWindow = qobject_cast<QMainWindow *>(widget);
+// //    //        break;
+// //    //    };
+// //    //KDMacTouchBar *touchBar = new KDMacTouchBar(mainWindow);
+// //    // Toggle teleprompter state
+// //    QIcon qpromptIcon(QStringLiteral(":images/qprompt"));
+// //    QAction *action = new QAction(qpromptIcon, "Toggle");
+// //    touchBar->addAction(action);
+// //    // connect(action, &QAction::triggered, this, &MainWindow::activated);
+// //    touchBar->addSeparator();
+// //    // Velocity and placement toachbar controls
+// //    touchBar->setTouchButtonStyle(KDMacTouchBar::IconOnly);
+// //    // Up
+// //    QIcon upIcon(QStringLiteral(":icons/go-previous"));
+// //    QAction *reduceAction = new QAction(upIcon, "Reduce");
+// //    touchBar->addAction(reduceAction);
+// //    touchBar->setPrincipialAction(reduceAction);
+// //    // connect(reduceAction, &QAction::triggered, this, &MainWindow::activated);
+// //    // Down
+// //    QIcon downIcon(QStringLiteral(":icons/go-next"));
+// //    QAction *increaseAction = new QAction(downIcon, "Increase");
+// //    touchBar->addAction(increaseAction);
+// //    // connect(increaseAction, &QAction::triggered, this, &MainWindow::activated);
+// ////    touchBar->addSeparator();
+// ////    // Stop prompter
+// ////    QAction *stopAction = new QAction(upIcon, "Stop");
+// ////    touchBar->addAction(stopAction);
+// ////    // connect(stopAction, &QAction::triggered, this, &MainWindow::activated);
+// #endif
 
 #if defined(QHotkey_FOUND)
     // Toggle transparency of all windows