Skip to content

Commit 6f9404f

Browse files
authored
Enable macOS installer tests (trikset#1899)
There is a chance, that this PR destroys copy-n-paste feature on macOS for text files. * Fix crash with obsolete MacPasteboardMime, just do not use it. * Enable installer tests for macOS * Make install script usable locally * Cleanup warnings
1 parent c0032e5 commit 6f9404f

File tree

10 files changed

+15
-14
lines changed

10 files changed

+15
-14
lines changed

.github/workflows/installer.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,26 +132,22 @@ jobs:
132132
run: |
133133
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".js --generate-mode javascript --close \
134134
-s 5 --script-path "$i".js -m script "$i"; done'
135-
if: ${{ !startsWith(inputs.os, 'macos') }}
136135
timeout-minutes: 15
137136

138137
- name: Run minimal Python interpeter tests in direct script mode
139138
run: |
140139
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".py \
141140
--close -s 5 --script-path "$i".py -m script "$i"; done'
142-
if: ${{ !startsWith(inputs.os, 'macos') }}
143141
timeout-minutes: 15
144142

145143
- name: Run minimal Javascript interpeter tests as fields in .qrs (For backward compatibility)
146144
run: |
147145
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".js "$i" \
148146
&& "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done'
149-
if: ${{ !startsWith(inputs.os, 'macos') }}
150147
timeout-minutes: 5
151148

152149
- name: Run minimal Python interpeter tests as fields in .qrs (For backward compatibility)
153150
run: |
154151
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".py "$i" \
155152
&& "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done'
156-
if: ${{ !startsWith(inputs.os, 'macos') }}
157153
timeout-minutes: 5

buildScripts/github/install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
#!/bin/bash
22
set -euxo pipefail
3+
BUILD_INSTALLER=${BUILD_INSTALLER:-true}
4+
TRIK_QT_VERSION=${TRIK_QT_VERSION:-5.15}
5+
XCODE_VERSION=${XCODE_VERSION:-14.3} # 14.3 on GHA worker is compatible with Qt5.15
6+
TRIK_PYTHON3_VERSION_MINOR=${TRIK_PYTHON3_VERSION_MINOR:-11}
7+
8+
39
TRIK_PYTHON=python3.${TRIK_PYTHON3_VERSION_MINOR}
410

511
install_qt(){

plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ using namespace twoDModel::constraints::details;
2626
using namespace kitBase;
2727

2828
ConditionsFactory::ConditionsFactory(Events &events
29-
, const Variables &variables
3029
, const Objects &objects
3130
, StatusReporter &status)
3231
: mEvents(events)
33-
, mVariables(variables)
3432
, mObjects(objects)
3533
, mStatus(status)
3634
{

plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace details {
2626
class ConditionsFactory
2727
{
2828
public:
29-
ConditionsFactory(Events &events, const Variables &variables, const Objects &objects, StatusReporter &status);
29+
ConditionsFactory(Events &events, const Objects &objects, StatusReporter &status);
3030

3131
/// Produces new condition instance that always returnes \a value.
3232
Condition constant(bool value) const;
@@ -81,7 +81,6 @@ class ConditionsFactory
8181
void reportError(const QString &message) const;
8282

8383
Events &mEvents;
84-
const Variables &mVariables;
8584
const Objects &mObjects;
8685
StatusReporter &mStatus;
8786
};

plugins/robots/common/twoDModel/src/engine/constraints/details/constraintsParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ConstraintsParser::ConstraintsParser(Events &events
3131
, mObjects(objects)
3232
, mTimeline(timeline)
3333
, mTriggers(mEvents, mVariables, status)
34-
, mConditions(mEvents, mVariables, mObjects, status)
34+
, mConditions(mEvents, mObjects, status)
3535
, mValues(mVariables, mObjects, status)
3636
{
3737
}

qrgui/textEditor/textManagerInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SystemEvents;
2424

2525
namespace text {
2626
class QScintillaTextEdit;
27-
class LanguageInfo;
27+
struct LanguageInfo;
2828
}
2929

3030
class QRGUI_TEXT_EDITOR_EXPORT TextManagerInterface : public QObject

qrtest/unitTests/common.pri

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ INCLUDEPATH += \
3838
$$PWD/../../ \
3939
$$PWD/testUtils/include \
4040

41+
CONFIG += c++17 # for GTEST
42+
4143
# the line below suppresses warnings generated by google's headers
4244
QMAKE_CXXFLAGS += \
4345
-isystem $$PWD/../thirdparty/googletest/googletest/googletest/include \

qrtranslations/fr/plugins/robots/twoDModel_fr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>QObject</name>
66
<message>
7-
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.cpp" line="+102"/>
7+
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.cpp" line="+100"/>
88
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/details/valuesFactory.cpp" line="+102"/>
99
<source>No such object: %1</source>
1010
<translation>Objet inexistant : %1</translation>

qrtranslations/ru/plugins/robots/twoDModel_ru.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
<translation>Атрибут &quot;%1&quot; тэга &quot;%2&quot; не может быть пустым.</translation>
304304
</message>
305305
<message>
306-
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.cpp" line="+107"/>
306+
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.cpp" line="+105"/>
307307
<source>No such region: %1</source>
308308
<translation>Нет такого региона: %1</translation>
309309
</message>

thirdparty/qscintilla/Qt4Qt5/qsciscintillabase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <QStyle>
3939
#include <QTextCodec>
4040

41-
#include "SciAccessibility.h"
41+
//#include "SciAccessibility.h"
4242
#include "ScintillaQt.h"
4343

4444

@@ -116,7 +116,7 @@ QsciScintillaBase::QsciScintillaBase(QWidget *parent)
116116

117117
triple_click.setSingleShot(true);
118118

119-
#if (QT_VERSION >= 0x040200 && QT_VERSION < 0x050000 && defined(Q_OS_MAC)) || (QT_VERSION >= 0x050200 && defined(Q_OS_OSX))
119+
#if DISABLED_BECAUSE_IS_OBSOLETE_AND_CRAHES && ((QT_VERSION >= 0x040200 && QT_VERSION < 0x050000 && defined(Q_OS_MAC)) || (QT_VERSION >= 0x050200 && defined(Q_OS_OSX)))
120120
initialiseRectangularPasteboardMime();
121121
#endif
122122

0 commit comments

Comments
 (0)