unmangle merges

Author: sethalves

cmake/macros/PackageCrashpadForDeployment.cmake

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

cmake/modules/FindCrashpad.cmake

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

interface/src/Application.cpp

@@ -601,24 +601,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
         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
     auto pluginManager = PluginManager::getInstance();
     pluginManager->setInputPluginProvider([] { return getInputPlugins(); });

interface/src/main.cpp

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

libraries/shared/CMakeLists.txt

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