Formatting cleanup

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)

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)

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;

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()

tools/skeleton-dump/src/SkeletonDumpApp.cpp

@@ -15,11 +15,6 @@
 #include <FBXSerializer.h>
 #include <AnimSkeleton.h>
 
-#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