Skip to content

Commit 2400a6f

Browse files
committed
GHA fix
1 parent 170dc0a commit 2400a6f

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
macos:
8080
runs-on: macos-15
8181
env:
82-
XCODE_VER: "16.4"
82+
XCODE_VER: "16.3"
8383
steps:
8484
- name: Checkout
8585
uses: actions/checkout@v4

builders/Linux/iwyu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
# Copyright (C) 2023 Andrew Wason
2+
# Copyright (C) 2025 Andrew Wason
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
set -e

builders/Linux/lint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ BUILD_TYPE=${BUILD_TYPE:-Debug}
99
RENDERWINDOW_BUILD=${BUILD_ROOT}/${BUILD_TYPE}
1010
mkdir -p "${RENDERWINDOW_BUILD}"
1111
cmake -S "${SOURCE_ROOT}" -B "$RENDERWINDOW_BUILD" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} --install-prefix ${QTDIR} || exit 1
12-
# Generate *.moc include files for tests
13-
cmake --build "${RENDERWINDOW_BUILD}" --target tst_encoder_autogen/fast tst_decoder_autogen/fast tst_interval_autogen/fast || exit 1
1412

1513
cd /renderwindow
1614
git config --global --add safe.directory /renderwindow

com/rectalogic/RenderWindow/render_control.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class RenderControl : public QQuickRenderControl {
1313
Q_OBJECT
1414
public:
1515
RenderControl(QObject* parent = nullptr)
16-
: QQuickRenderControl(parent) {};
16+
: QQuickRenderControl(parent) { };
1717
RenderControl(RenderControl&&) = delete;
1818
RenderControl& operator=(RenderControl&&) = delete;
1919
~RenderControl() override = default;

com/rectalogic/RenderWindow/render_window.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#include <QDebug>
77
#include <QMessageLogContext>
88
#include <QQmlEngine>
9-
#include <QQmlInfo>
9+
#include <QQmlTypeNotAvailable>
1010
#include <QQuickItem>
11-
#ifdef MEDIAFX_ENABLE_VULKAN
11+
#ifdef RENDERWINDOW_ENABLE_VULKAN
1212
#include <QQuickGraphicsConfiguration>
1313
#include <QSGRendererInterface>
1414
#include <QVersionNumber>

com/rectalogic/RenderWindow/render_window.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
// SPDX-License-Identifier: GPL-3.0-or-later
33

44
#pragma once
5+
#include <QByteArray>
56
#include <QObject>
6-
#include <QPointer>
77
#include <QQmlParserStatus>
88
#include <QQuickWindow>
99
#include <QtCore>
1010
#include <QtQmlIntegration>
1111
#include <memory>
1212
#include <qtgui-config.h>
13+
class RenderControl;
1314
#if (QT_CONFIG(vulkan) && __has_include(<vulkan/vulkan.h>))
1415
#define RENDERWINDOW_ENABLE_VULKAN
1516
#endif
@@ -42,7 +43,7 @@ class RenderWindow : public QQuickWindow, public QQmlParserStatus {
4243

4344
RenderWindow(RenderControl* renderControl);
4445

45-
#ifdef MEDIAFX_ENABLE_VULKAN
46+
#ifdef RENDERWINDOW_ENABLE_VULKAN
4647
QVulkanInstance m_vulkanInstance;
4748
#endif
4849
std::unique_ptr<RenderControl> m_renderControl;

0 commit comments

Comments
 (0)