Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 05:40:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formatting cleanup

Browse source
This commit is contained in:
Dale Glass 2021-06-19 19:38:07 +02:00
parent 586de4d712
commit f90d872752
5 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hifi_qt.py
View file

@ -119,7 +119,7 @@ endif()
raise Exception("Failed to find Qt5 directory under " + self.cmakePath + ". There should be a " + qt5_dir) raise Exception("Failed to find Qt5 directory under " + self.cmakePath + ". There should be a " + qt5_dir)
else: else:
print("Qt5 check passed, found " + qt5_dir) print("Qt5 check passed, found " + qt5_dir)
# I'm not sure why this is needed. It's used by hifi_singleton. # I'm not sure why this is needed. It's used by hifi_singleton.
# Perhaps it stops multiple build processes from interferring? # Perhaps it stops multiple build processes from interferring?
lockDir, lockName = os.path.split(self.path) lockDir, lockName = os.path.split(self.path)

2
interface/CMakeLists.txt
View file

@ -198,7 +198,7 @@ if (BUILD_TOOLS AND NPM_EXECUTABLE)
endif() endif()
if (WIN32 OR APPLE) if (WIN32 OR APPLE)
add_dependencies(${TARGET_NAME} resources) add_dependencies(${TARGET_NAME} resources)
endif() endif()
if (SCREENSHARE) if (SCREENSHARE)

4
libraries/controllers/src/controllers/UserInputMapper.cpp
View file

@ -44,10 +44,6 @@
#include "impl/Route.h" #include "impl/Route.h"
#include "impl/Mapping.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 { namespace controller {
const uint16_t UserInputMapper::STANDARD_DEVICE = 0; const uint16_t UserInputMapper::STANDARD_DEVICE = 0;

2
prebuild.py
View file

@ -139,7 +139,7 @@ def main():
if qtInstallPath is not None: if qtInstallPath is not None:
# qtInstallPath is None when we're doing a system Qt build # qtInstallPath is None when we're doing a system Qt build
print("cmake path: " + qtInstallPath) print("cmake path: " + qtInstallPath)
with hifi_singleton.Singleton(qt.lockFile) as lock: with hifi_singleton.Singleton(qt.lockFile) as lock:
with timer('Qt'): with timer('Qt'):
qt.installQt() qt.installQt()

5
tools/skeleton-dump/src/SkeletonDumpApp.cpp
View file

@ -15,11 +15,6 @@
#include <FBXSerializer.h> #include <FBXSerializer.h>
#include <AnimSkeleton.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) { SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc, argv) {
// parse command-line // parse command-line