Skip to content

Commit 479d2b1

Browse files
committed
Testing oldschool builds
1 parent e32ca10 commit 479d2b1

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ on:
44
push:
55
branches:
66
- master
7+
- oldschool_builds
78
pull_request:
8-
9+
910
concurrency:
1011
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1112
cancel-in-progress: true
@@ -149,6 +150,7 @@ jobs:
149150
# workaround to allow to find the Qt include dirs for installed standard qt packages
150151
mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
151152
export QTDIR=/usr/include/qt5ln
153+
cat /usr/include/qt5/QtCore/QtCore
152154
cd generator
153155
./pythonqt_generator
154156
@@ -159,6 +161,7 @@ jobs:
159161
path: generated_cpp
160162

161163
macOS:
164+
if: false
162165
strategy:
163166
fail-fast: false
164167
matrix:
@@ -249,6 +252,7 @@ jobs:
249252
path: generated_cpp
250253

251254
windows:
255+
if: false
252256
strategy:
253257
fail-fast: false
254258
matrix:

generator/qtscript_masterinclude.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,17 @@
8585
#define QOPENGLFUNCTIONS_H
8686
#define QOPENGLEXTRAFUNCTIONS_H
8787

88+
#ifndef QT_FEATURE_thread
89+
#define QT_BOOTSTRAPPED
90+
#endif
91+
8892
/* This must only be included after 'QT_NO_' definitions have been defined. */
8993
#include <QtCore/qglobal.h>
9094

95+
// workaround to avoid compile error for undefined feature, original define:
96+
// #define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1)
97+
#define QT_CONFIG(feature) (QT_FEATURE_##feature == 1)
98+
9199
/* NOTE: Qt5.12 and later (including Qt6) uses template functions for the
92100
* static implementations of QTimer::singleShot() (the function, not the
93101
* property). The generator does not handle template functions. Defining

0 commit comments

Comments
 (0)