Skip to content

test #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MinyazevR wants to merge 3 commits into
base: master
Choose a base branch
from
Open

test #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e528e8e
Set an explicit dependency in rpath for dylib from /usr/local (#1943)
MinyazevR Jun 20, 2025
1cfab89
Fix a crash when uploading an xml field
MinyazevR Jun 16, 2025
fc92337
Update translations
MinyazevR Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion installer/utils/mac_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ function fix_dependencies {
local short_id
local install_name
install_name=$(otool -D "$target" | tail -n +2 | grep -v '^@' || : )
if [[ -n "$install_name" ]] ; then
if [[ "$install_name" == "/usr/local"/* ]] ; then
short_id="@rpath/$(basename "$install_name")"
change="-id \"$short_id\""
elif [[ -n "$install_name" ]] ; then
short_id=$(grealpath -e --relative-to "$prefix" "$install_name" || echo "@rpath/"$(basename "$install_name"))
change="-id \"$short_id\""
fi
Expand Down
10 changes: 8 additions & 2 deletions plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,16 @@ bool ConstraintsChecker::parseConstraints(const QDomElement &constraintsXml)
mEvents.clear();
mActiveEvents.clear();
mVariables.clear();

mCurrentXml = constraintsXml;
mParsedSuccessfully = mParser->parse(constraintsXml);

if (mParsedSuccessfully) {
auto importNode = mCurrentConstraintDocument.importNode(constraintsXml, true);
if (!importNode.isNull()) {
mCurrentXml = importNode.toElement();
mCurrentConstraintDocument.appendChild(mCurrentXml);
}
}

for (const QString &error : mParser->errors()) {
reportParserError(error);
}
Expand Down
1 change: 1 addition & 0 deletions plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class ConstraintsChecker : public QObject

QList<details::Event *> mActiveEvents; //No ownership

QDomDocument mCurrentConstraintDocument;
QDomElement mCurrentXml;
bool mEnabled { true };
};
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/fr/plugins/robots/twoDModel_fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
<context>
<name>twoDModel::constraints::ConstraintsChecker</name>
<message>
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+112"/>
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+118"/>
<source>Error while parsing constraints: %1</source>
<translation>Une erreur lors de l&apos;analyse des contraints est survenue : %1</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/ru/plugins/robots/twoDModel_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
<context>
<name>twoDModel::constraints::ConstraintsChecker</name>
<message>
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+112"/>
<location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+118"/>
<source>Error while parsing constraints: %1</source>
<translation>Ошибка чтения ограничений: %1</translation>
</message>
Expand Down
Loading