Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-07-25 07:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

unmangle merges

Browse source
This commit is contained in:
Seth Alves 2018-01-26 11:57:30 -08:00
parent 19409cc6ce
commit b7303414f2
5 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/macros/PackageCrashpadForDeployment.cmake
View file

@ -13,6 +13,11 @@ macro(PACKAGE_CRASHPAD_FOR_DEPLOYMENT)
get_property(HAS_CRASHPAD GLOBAL PROPERTY HAS_CRASHPAD) get_property(HAS_CRASHPAD GLOBAL PROPERTY HAS_CRASHPAD)
if (HAS_CRASHPAD) if (HAS_CRASHPAD)
if (WIN32)
set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "/ignore:4099")
endif()
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} TARGET ${TARGET_NAME}
POST_BUILD POST_BUILD

2
cmake/modules/FindCrashpad.cmake
View file

@ -5,7 +5,7 @@
# Once done this will define # Once done this will define
# #
# CRASHPAD_FOUND # CRASHPAD_FOUND
# DRACO_INCLUDE_DIRS # CRASHPAD_INCLUDE_DIRS
# CRASHPAD_LIBRARY # CRASHPAD_LIBRARY
# CRASHPAD_BASE_LIBRARY # CRASHPAD_BASE_LIBRARY
# CRASHPAD_UTIL_LIBRARY # CRASHPAD_UTIL_LIBRARY

18
interface/src/Application.cpp
View file

@ -601,24 +601,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
qApp->setProperty(hifi::properties::APP_LOCAL_DATA_PATH, cacheDir); qApp->setProperty(hifi::properties::APP_LOCAL_DATA_PATH, cacheDir);
} }
// FIXME fix the OSX installer to install the resources.rcc binary instead of resource files and remove
// this conditional exclusion
#if !defined(Q_OS_OSX)
{
#if defined(Q_OS_ANDROID)
const QString resourcesBinaryFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/resources.rcc";
#else
const QString resourcesBinaryFile = QCoreApplication::applicationDirPath() + "/resources.rcc";
#endif
if (!QFile::exists(resourcesBinaryFile)) {
throw std::runtime_error("Unable to find primary resources");
}
if (!QResource::registerResource(resourcesBinaryFile)) {
throw std::runtime_error("Unable to load primary resources");
}
}
#endif
// Tell the plugin manager about our statically linked plugins // Tell the plugin manager about our statically linked plugins
auto pluginManager = PluginManager::getInstance(); auto pluginManager = PluginManager::getInstance();
pluginManager->setInputPluginProvider([] { return getInputPlugins(); }); pluginManager->setInputPluginProvider([] { return getInputPlugins(); });

2
interface/src/main.cpp
View file

@ -46,8 +46,6 @@ int main(int argc, const char* argv[]) {
disableQtBearerPoll(); // Fixes wifi ping spikes disableQtBearerPoll(); // Fixes wifi ping spikes
startCrashHandler();
QElapsedTimer startupTime; QElapsedTimer startupTime;
startupTime.start(); startupTime.start();

2
libraries/shared/CMakeLists.txt
View file

@ -5,8 +5,6 @@ setup_hifi_library(Gui Network Script Widgets)
if (WIN32) if (WIN32)
target_link_libraries(${TARGET_NAME} Wbemuuid.lib) target_link_libraries(${TARGET_NAME} Wbemuuid.lib)
add_crashpad()
endif() endif()
if (ANDROID) if (ANDROID)