diff --git a/hifi_qt.py b/hifi_qt.py index 6174a27505..34b9536b0c 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -119,7 +119,7 @@ endif() raise Exception("Failed to find Qt5 directory under " + self.cmakePath + ". There should be a " + qt5_dir) else: print("Qt5 check passed, found " + qt5_dir) - + # I'm not sure why this is needed. It's used by hifi_singleton. # Perhaps it stops multiple build processes from interferring? lockDir, lockName = os.path.split(self.path) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 72ab17a6f2..a2a29ed4ba 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -198,7 +198,7 @@ if (BUILD_TOOLS AND NPM_EXECUTABLE) endif() if (WIN32 OR APPLE) - add_dependencies(${TARGET_NAME} resources) + add_dependencies(${TARGET_NAME} resources) endif() if (SCREENSHARE) diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp index b5e07d5691..6333792b3f 100755 --- a/libraries/controllers/src/controllers/UserInputMapper.cpp +++ b/libraries/controllers/src/controllers/UserInputMapper.cpp @@ -44,10 +44,6 @@ #include "impl/Route.h" #include "impl/Mapping.h" -#if QT_VERSION > QT_VERSION_CHECK(5, 13, 0) -// FIXME: Remove this after Qt 5.15 upgrade -#define endl Qt::endl -#endif namespace controller { const uint16_t UserInputMapper::STANDARD_DEVICE = 0; diff --git a/prebuild.py b/prebuild.py index 34549b038c..b5390362e8 100644 --- a/prebuild.py +++ b/prebuild.py @@ -139,7 +139,7 @@ def main(): if qtInstallPath is not None: # qtInstallPath is None when we're doing a system Qt build print("cmake path: " + qtInstallPath) - + with hifi_singleton.Singleton(qt.lockFile) as lock: with timer('Qt'): qt.installQt() diff --git a/tools/skeleton-dump/src/SkeletonDumpApp.cpp b/tools/skeleton-dump/src/SkeletonDumpApp.cpp index e3169098d6..42a1c78090 100644 --- a/tools/skeleton-dump/src/SkeletonDumpApp.cpp +++ b/tools/skeleton-dump/src/SkeletonDumpApp.cpp @@ -15,11 +15,6 @@ #include #include -#if QT_VERSION > QT_VERSION_CHECK(5, 13, 0) -// FIXME: Remove this after Qt 5.15 upgrade -#define endl Qt::endl -#endif - SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc, argv) { // parse command-line