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.

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

Crowdin: fixes pre-0.18 release #1912

Merged
merged 32 commits into from Jan 30, 2019

Conversation

Projects
None yet
6 participants
@luzpaz
Copy link
Contributor

luzpaz commented Jan 15, 2019

Includes some whitespace fixes as well.

Show resolved Hide resolved src/Gui/CommandDoc.cpp Outdated
Show resolved Hide resolved src/Gui/CommandDoc.cpp Outdated
Show resolved Hide resolved src/Gui/CommandDoc.cpp
Show resolved Hide resolved src/Gui/GestureNavigationStyle.cpp
Show resolved Hide resolved src/Gui/MayaGestureNavigationStyle.cpp
Show resolved Hide resolved src/Gui/Selection.cpp
Show resolved Hide resolved src/Mod/Mesh/Gui/DlgSettingsImportExport.ui Outdated
Show resolved Hide resolved src/Mod/Part/Gui/DlgSettings3DViewPart.ui Outdated
Show resolved Hide resolved src/Mod/TechDraw/Gui/MDIViewPage.cpp
@yorikvanhavre

This comment has been minimized.

Copy link
Member

yorikvanhavre commented Jan 16, 2019

The ‘QString::QString(const char*)’ is private error that shows in the CI buillds logs usually means this: You have a QString, and you are trying to add a C string to it (basically just a double-quoted text). You can only add another QString to a QString (that is because it's private. If not, apparently Qstrings would be able to do that conversion automatically, but I haven't fully understood all that yet).

So instead of:
QString message(QObject::tr("Rotation:")+" ");
you need to do something like this:
QString message(QObject::tr("Rotation:")+QString::fromUtf8(" "));
(The result of QObject::tr is already a QString)
Note that this is only for QStrings. When you are dealing with a stream, where you add stuff with <<, it is able to swallow C strings directly.

Basically the way to solve these things is to look at the CI logs, find the error that made the build stop (usually near the end of the log), fix that error, push, wait for the new build, fix the next error. This is obviously much, much faster when you compile yourself.

@WandererFan

This comment has been minimized.

Copy link
Contributor

WandererFan commented Jan 18, 2019

@luzpaz

This comment has been minimized.

Copy link
Contributor Author

luzpaz commented Jan 18, 2019

Appveyor stalled: Build execution time has reached the maximum allowed time for your plan (60 minutes).

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch 2 times, most recently from 3238e59 to 4590596 Jan 19, 2019

@luzpaz luzpaz changed the title [WIP] Crowdin: fixes pre-0.18 release Crowdin: fixes pre-0.18 release Jan 20, 2019

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch from 4590596 to 62597f6 Jan 20, 2019

Show resolved Hide resolved src/Gui/NetworkRetriever.cpp Outdated
@WandererFan

This comment has been minimized.

Copy link
Contributor

WandererFan commented Jan 21, 2019

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch 4 times, most recently from 7aec632 to 4337317 Jan 21, 2019

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch from 4337317 to 4cc7006 Jan 24, 2019

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch 3 times, most recently from d8cc305 to f434ec7 Jan 26, 2019

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch from 2b74c68 to 588fc58 Jan 26, 2019

@luzpaz

This comment has been minimized.

Copy link
Contributor Author

luzpaz commented Jan 26, 2019

Rebased. Should be ready for merge once Travis check is complete.

@luzpaz

This comment has been minimized.

Copy link
Contributor Author

luzpaz commented Jan 27, 2019

There is a previous commit that introduced a compilation error that makes TravisCI fail here.
I reported it over at d2ddce6#r32078352
CC @wwmayer

@wwmayer

This comment has been minimized.

Copy link
Contributor

wwmayer commented Jan 27, 2019

Commit d2ddce6 is supposed to fix (not causing) this failure. The point is that Standard_OVERRIDE is defined by newer OCCT versions and when using it inside FreeCAD code then it causes the build to fail when using older OCCT versions where this is not defined.

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch 2 times, most recently from 2f42e3d to 9b84c58 Jan 27, 2019

luzpaz added some commits Jan 17, 2019

Fix for a previous commits
Crowdin:  Sketcher/App/SketcherAnalysis remove newlines
Crowdin:  Part/AttachmentEditor/TaskAttachmentEditor.py fix previous commiit
Crowdin:  Gui/NetworkRetriever.cpp correct previous commit

@luzpaz luzpaz force-pushed the luzpaz:crowdin/pre-0.18-fixes branch from 9b84c58 to 9e6570e Jan 28, 2019

@luzpaz

This comment has been minimized.

Copy link
Contributor Author

luzpaz commented Jan 28, 2019

@wmayer this PR is ready to go.
Appveyor is failing because it timeouts (build is over 1 hour limit)

@yorikvanhavre yorikvanhavre merged commit 13622cd into FreeCAD:master Jan 30, 2019

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@luzpaz luzpaz deleted the luzpaz:crowdin/pre-0.18-fixes branch Jan 30, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment