Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
parent 512fbbe6b2 bf8897551f
commit d9ec159f0e
50 changed files with 937 additions and 414 deletions
@@ -23,7 +23,7 @@ namespace O3DE::ProjectManager
        // QProcess::waitForFinished uses -1 to indicate that the process should not timeout
        static constexpr int MaxBuildTimeMSecs = -1;
        // Build was cancelled
-        static const QString BuildCancelled;
+        inline static const QString BuildCancelled = QObject::tr("Build Cancelled.");

        Q_OBJECT