From 7c48aee672fc54d9ceb43577071e1d00da84b0f1 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Tue, 28 May 2019 18:20:14 -1000 Subject: [PATCH 1/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 676daf10..e87787ac 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ They should be set to `C:/Qt//msvc2017_64/lib/cmake/Qt5`. ## Requirements * [Xcode 10.2+](https://developer.apple.com/xcode/) -* [Qt 5.10+](https://download.qt.io/official_releases/qt/) (Clang 64-bit specification) +* [Qt 5.10+](https://download.qt.io/official_releases/qt/) (macOS specification) * *cmake*, *ninja* and *python* installed using [Homebrew](https://brew.sh/) ## Build using Xcode @@ -83,7 +83,7 @@ They should be set to `C:/Qt//msvc2017_64/lib/cmake/Qt5`. ## Requirements * A working compiler toolchain (GCC or Clang) -* *cmake*, *ninja*, *python3*, *clang* (library) packages +* *cmake*, *ninja*, *python3*, *qt5* (dev), *clang* (dev) packages ## Build using Command Line From 9b95f0b33d91bc7d8d8a7de900eb333c6cbc8250 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Tue, 28 May 2019 19:32:18 -1000 Subject: [PATCH 2/4] Ensure editor window deletion is deferred --- src/Editor/CEditorApplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Editor/CEditorApplication.cpp b/src/Editor/CEditorApplication.cpp index fd952209..7e883a7c 100644 --- a/src/Editor/CEditorApplication.cpp +++ b/src/Editor/CEditorApplication.cpp @@ -364,7 +364,7 @@ void CEditorApplication::OnEditorClose() if (pEditor != mpWorldEditor->TweakEditor()) { - delete pEditor; + pEditor->deleteLater(); } if (mpActiveProject) From 7bc442295418e393c14f58d08218df5b3509f65d Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 2 Jun 2019 13:29:01 -1000 Subject: [PATCH 3/4] Variable consistency changes for dew.cmake --- dew.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dew.cmake b/dew.cmake index f829ba7f..071f601a 100644 --- a/dew.cmake +++ b/dew.cmake @@ -32,9 +32,9 @@ function(integrate_dew) message(FATAL_ERROR "Failed to install dew with pip: result: ${install_dew_result}.") endif() message(STATUS "Building dew dependencies") - execute_process(COMMAND "${Python3_EXECUTABLE}" -m dew update WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + execute_process(COMMAND "${Python3_EXECUTABLE}" -m dew update WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE dew_res) - if(NOT ${dew_res} EQUAL 0) + if(NOT dew_res EQUAL 0) message(FATAL_ERROR "Unable to run dew: ${dew_res}") endif() endif() From 54940d33df24997871c8abb9d7ec58ec4786705d Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 2 Jun 2019 15:24:13 -1000 Subject: [PATCH 4/4] Update dependencies --- dewfile.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dewfile.json b/dewfile.json index 4e0d45f7..9f7e38fe 100644 --- a/dewfile.json +++ b/dewfile.json @@ -34,14 +34,14 @@ "url": "https://github.com/jackoalan/CodeGen", "type": "git", "head": "cmake", - "ref": "3103ec4e9c4ae71b05c9e5ca46ee14f8682162a0" + "ref": "390a5fa690e0492eee7219b495f7a8c84528edbe" }, { "name": "LibCommon", "url": "https://github.com/jackoalan/LibCommon", "type": "git", "head": "dew", - "ref": "a36312e91be8d6489d6b34447281dabb5422f96f" + "ref": "d5b78bcc7a050ffc958a4b0a679b279a78202da7" }, { "name": "lzokay",