Make MCP server build optional when qthttpserver is unavailable

Use qtHaveModule(httpserver) to conditionally enable MCP support,
guarded by HAVE_MCP preprocessor define throughout the codebase.
This fixes CI builds on platforms without the Qt HttpServer module.

Author: aalex

src/app/main.cpp

@@ -105,10 +105,12 @@ int main(int argc, char *argv[])
     "Use OSC port number <osc-port>.", "osc-port", "");
   parser.addOption(oscPortOption);
 
+#ifdef HAVE_MCP
   // --mcp-port option
   QCommandLineOption mcpPortOption(QStringList() << "m" << "mcp-port",
     "Use MCP server port number <mcp-port> (0 to disable).", "mcp-port", "");
   parser.addOption(mcpPortOption);
+#endif
 
   // --lang option
   QCommandLineOption localeOption(QStringList() << "l" << "lang",
@@ -218,9 +220,11 @@ int main(int argc, char *argv[])
   if (parser.isSet(verboseOption))
     win->setVerbose(true);
 
+#ifdef HAVE_MCP
   QString mcpPortValue = parser.value("mcp-port");
   if (mcpPortValue != "")
     win->setMcpPort(mcpPortValue);
+#endif
 
   bool optionOk;
   qreal fps = parser.value("frame-rate").toDouble(&optionOk);

src/control/control.pri

@@ -1,11 +1,14 @@
 include(../src.pri)
 
 HEADERS += $$PWD/ConcurrentQueue.h \
-    $$PWD/OscInterface.h \
-    $$PWD/McpServer.h
+    $$PWD/OscInterface.h
 
-SOURCES += $$PWD/OscInterface.cpp \
-    $$PWD/McpServer.cpp
+SOURCES += $$PWD/OscInterface.cpp
+
+contains(DEFINES, HAVE_MCP) {
+  HEADERS += $$PWD/McpServer.h
+  SOURCES += $$PWD/McpServer.cpp
+}
 
 # OSC support:
 INCLUDEPATH += $$PWD/qosc

src/gui/MainWindow.cpp

@@ -89,8 +89,10 @@ MainWindow::MainWindow()
   // Start osc.
   startOscReceiver();
 
+#ifdef HAVE_MCP
   // Start MCP server.
   startMcpServer();
+#endif
 
   // Defaults.
   setWindowIcon(QIcon(":/mapmap-logo"));
@@ -2530,7 +2532,9 @@ void MainWindow::readSettings()
   displayControlsAction->setChecked(settings.value("displayControls", MM::DISPLAY_CONTROLS).toBool());
   outputWindow->setCanvasDisplayCrosshair(settings.value("displayControls", MM::DISPLAY_CONTROLS).toBool());
   oscListeningPort = settings.value("oscListeningPort", MM::DEFAULT_OSC_PORT).toInt();
+#ifdef HAVE_MCP
   mcpListeningPort = settings.value("mcpListeningPort", MM::DEFAULT_MCP_PORT).toInt();
+#endif
 
   // Update Recent files and video
   updateRecentFileActions();
@@ -3741,6 +3745,7 @@ bool MainWindow::setOscPort(QString portNumber)
   return true;
 }
 
+#ifdef HAVE_MCP
 void MainWindow::startMcpServer()
 {
   if (mcp_server.isNull())
@@ -3791,6 +3796,7 @@ bool MainWindow::setMcpPort(QString portNumber)
     return false;
   }
 }
+#endif // HAVE_MCP
 
 void MainWindow::pollOscInterface()
 {

src/gui/MainWindow.h

@@ -37,7 +37,9 @@
 #include "MapperGLCanvas.h"
 #include "MapperGLCanvasToolbar.h"
 #include "OscInterface.h"
+#ifdef HAVE_MCP
 #include "McpServer.h"
+#endif
 
 #include "OutputGLWindow.h"
 #include "ConsoleWindow.h"
@@ -303,8 +305,10 @@ public slots:
   // OSC.
   void startOscReceiver();
 
+#ifdef HAVE_MCP
   // MCP server.
   void startMcpServer();
+#endif
 
   // Actions-related.
   bool okToContinue();
@@ -522,9 +526,11 @@ public slots:
   int oscListeningPort;
   QTimer *osc_timer;
 
+#ifdef HAVE_MCP
   // MCP server.
   QScopedPointer<McpServer> mcp_server;
   int mcpListeningPort;
+#endif
 
   // View.
 
@@ -632,9 +638,11 @@ public slots:
   bool setOscPort(int portNumber);
   int getOscPort() const;
   void setVerbose(bool verbose);
+#ifdef HAVE_MCP
   bool setMcpPort(QString portNumber);
   bool setMcpPort(int portNumber);
   int getMcpPort() const;
+#endif
   void setOutputWindowFullScreen(bool enable);
 
 public:

src/gui/PreferenceDialog.cpp

@@ -122,8 +122,10 @@ bool PreferenceDialog::loadSettings()
 
   // Allow OSC message with same media source
   _oscSameMediaSourceBox->setChecked(settings.value("oscSameMediaSource", MM::OSC_SAME_MEDIA_SOURCE).toBool());
+#ifdef HAVE_MCP
   // MCP port
   _mcpPortNumber->setValue(settings.value("mcpListeningPort", MM::DEFAULT_MCP_PORT).toInt());
+#endif
   // Play in loop
   _playInLoopBox->setChecked(settings.value("playInLoop", MM::PLAY_IN_LOOP).toBool());
 
@@ -158,9 +160,11 @@ void PreferenceDialog::applySettings()
   settings.setValue("language", _languageBox->currentData());
   // Allow OSC message with same media source
   settings.setValue("oscSameMediaSource", _oscSameMediaSourceBox->isChecked());
+#ifdef HAVE_MCP
   // MCP port
   settings.setValue("mcpListeningPort", _mcpPortNumber->value());
   mainWindow->setMcpPort(_mcpPortNumber->value());
+#endif
   // Play in loop
   settings.setValue("playInLoop", _playInLoopBox->isChecked());
 }
@@ -378,6 +382,7 @@ void PreferenceDialog::createControlsPage()
 
   _controlsPage->addTab(_oscWidget, tr("OSC Setup"));
 
+#ifdef HAVE_MCP
   // MCP Tab
   _mcpWidget = new QWidget;
 
@@ -397,6 +402,7 @@ void PreferenceDialog::createControlsPage()
   _mcpWidget->setLayout(mcpLayout);
 
   _controlsPage->addTab(_mcpWidget, tr("MCP Setup"));
+#endif
 
   refreshCurrentIP();
 }

src/gui/PreferenceDialog.h

@@ -109,9 +109,11 @@ private slots:
   QSpinBox *_listenPortNumber;
   QPushButton *_ipRefreshButton;
   QCheckBox *_oscSameMediaSourceBox;
+#ifdef HAVE_MCP
   // MCP
   QWidget *_mcpWidget;
   QSpinBox *_mcpPortNumber;
+#endif
 
   // Advanced widgets
   // Playback

src/src.pri

@@ -6,7 +6,13 @@ QT += network
 QT += multimedia
 QT += multimediawidgets
 QT += widgets
-QT += httpserver
+qtHaveModule(httpserver) {
+  QT += httpserver
+  DEFINES += HAVE_MCP
+  message("Qt HttpServer module found — MCP server enabled")
+} else {
+  message("Qt HttpServer module not found — MCP server disabled")
+}
 
 #Includes common configuration for all subdirectory .pro files.
 INCLUDEPATH += $$PWD/core \