From 0781d8eaf03a21a22c3050f633720a36aa874855 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 17 Jan 2018 22:19:21 -0800 Subject: [PATCH] Remove some unneeded Qt dependencies --- assignment-client/CMakeLists.txt | 2 +- gvr-interface/CMakeLists.txt | 4 ++-- interface/CMakeLists.txt | 4 ++-- libraries/avatars-renderer/CMakeLists.txt | 2 +- libraries/display-plugins/CMakeLists.txt | 2 +- libraries/entities-renderer/CMakeLists.txt | 2 +- libraries/gl/CMakeLists.txt | 2 +- libraries/gpu-gles/CMakeLists.txt | 2 +- libraries/networking/src/AddressManager.cpp | 6 +++--- libraries/plugins/CMakeLists.txt | 2 +- libraries/render-utils/CMakeLists.txt | 2 +- libraries/script-engine/CMakeLists.txt | 1 + libraries/shared/CMakeLists.txt | 2 +- libraries/trackers/src/trackers/EyeTracker.cpp | 1 - libraries/ui-plugins/CMakeLists.txt | 2 +- libraries/ui/CMakeLists.txt | 2 +- plugins/hifiCodec/src/HiFiCodec.cpp | 3 +-- plugins/hifiKinect/CMakeLists.txt | 2 +- plugins/hifiLeapMotion/CMakeLists.txt | 2 +- plugins/hifiNeuron/CMakeLists.txt | 2 +- plugins/hifiSdl2/CMakeLists.txt | 2 +- plugins/hifiSdl2/src/SDL2Manager.cpp | 5 +++-- plugins/hifiSixense/CMakeLists.txt | 2 +- plugins/hifiSpacemouse/CMakeLists.txt | 2 +- plugins/openvr/CMakeLists.txt | 2 +- plugins/pcmCodec/src/PCMCodecManager.cpp | 2 +- tests/gpu-test/CMakeLists.txt | 2 +- tests/render-perf/CMakeLists.txt | 2 +- tests/render-texture-load/CMakeLists.txt | 2 +- tests/render-utils/CMakeLists.txt | 2 +- tests/shaders/CMakeLists.txt | 2 +- tools/ac-client/CMakeLists.txt | 2 +- tools/ac-client/src/ACClientApp.h | 2 +- tools/atp-client/CMakeLists.txt | 2 +- tools/atp-client/src/ATPClientApp.h | 2 +- tools/ice-client/CMakeLists.txt | 2 +- tools/ice-client/src/ICEClientApp.h | 2 +- tools/skeleton-dump/CMakeLists.txt | 2 +- tools/skeleton-dump/src/SkeletonDumpApp.h | 2 +- tools/vhacd-util/CMakeLists.txt | 2 +- tools/vhacd-util/src/VHACDUtilApp.h | 2 +- 41 files changed, 46 insertions(+), 46 deletions(-) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index acdc1cbc53..c73e8e1d34 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -1,6 +1,6 @@ set(TARGET_NAME assignment-client) -setup_hifi_project(Core Gui Network Script Quick Widgets WebSockets) +setup_hifi_project(Core Gui Network Script Quick WebSockets) # Fix up the rpath so macdeployqt works if (APPLE) diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt index 7d6655e875..72f1096881 100644 --- a/gvr-interface/CMakeLists.txt +++ b/gvr-interface/CMakeLists.txt @@ -17,9 +17,9 @@ if (ANDROID) set(BUILD_SHARED_LIBS ON) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}") - setup_hifi_library(Gui Widgets AndroidExtras) + setup_hifi_library(Gui AndroidExtras) else () - setup_hifi_project(Gui Widgets) + setup_hifi_project(Gui) endif () include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 383c50ed44..0c4319a9b7 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -70,7 +70,7 @@ endif () find_package( Qt5 COMPONENTS - Gui Multimedia Network OpenGL Qml Quick Script Svg + Gui Widgets Multimedia Network Qml Quick Script Svg ${PLATFORM_QT_COMPONENTS} WebChannel WebSockets ) @@ -255,7 +255,7 @@ endif () target_link_libraries( ${TARGET_NAME} - Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::OpenGL + Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::Widgets Qt5::Qml Qt5::Quick Qt5::Script Qt5::Svg Qt5::WebChannel ${PLATFORM_QT_LIBRARIES} diff --git a/libraries/avatars-renderer/CMakeLists.txt b/libraries/avatars-renderer/CMakeLists.txt index 53edc692f2..1f740700c5 100644 --- a/libraries/avatars-renderer/CMakeLists.txt +++ b/libraries/avatars-renderer/CMakeLists.txt @@ -1,6 +1,6 @@ set(TARGET_NAME avatars-renderer) AUTOSCRIBE_SHADER_LIB(gpu graphics render render-utils) -setup_hifi_library(Widgets Network Script) +setup_hifi_library(Network Script) link_hifi_libraries(shared gpu graphics animation model-networking script-engine render render-utils image trackers entities-renderer) include_hifi_library_headers(avatars) include_hifi_library_headers(networking) diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt index 1d9d42d579..7d34258c96 100644 --- a/libraries/display-plugins/CMakeLists.txt +++ b/libraries/display-plugins/CMakeLists.txt @@ -1,6 +1,6 @@ set(TARGET_NAME display-plugins) AUTOSCRIBE_SHADER_LIB(gpu display-plugins) -setup_hifi_library(OpenGL) +setup_hifi_library(Gui) link_hifi_libraries(shared plugins ui-plugins gl ui render-utils ${PLATFORM_GL_BACKEND}) include_hifi_library_headers(gpu) include_hifi_library_headers(model-networking) diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt index ea75367e1e..4b94757dec 100644 --- a/libraries/entities-renderer/CMakeLists.txt +++ b/libraries/entities-renderer/CMakeLists.txt @@ -1,6 +1,6 @@ set(TARGET_NAME entities-renderer) AUTOSCRIBE_SHADER_LIB(gpu graphics procedural render render-utils) -setup_hifi_library(Widgets Network Script) +setup_hifi_library(Network Script) link_hifi_libraries(shared gpu procedural graphics model-networking script-engine render render-utils image ui pointers) include_hifi_library_headers(networking) include_hifi_library_headers(gl) diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt index 9fc7a0c10f..925cf9b288 100644 --- a/libraries/gl/CMakeLists.txt +++ b/libraries/gl/CMakeLists.txt @@ -1,5 +1,5 @@ set(TARGET_NAME gl) -setup_hifi_library(OpenGL Qml Quick) +setup_hifi_library(Gui Widgets Qml Quick) link_hifi_libraries(shared) target_opengl() diff --git a/libraries/gpu-gles/CMakeLists.txt b/libraries/gpu-gles/CMakeLists.txt index 16575a7018..ea69919f6d 100644 --- a/libraries/gpu-gles/CMakeLists.txt +++ b/libraries/gpu-gles/CMakeLists.txt @@ -1,5 +1,5 @@ set(TARGET_NAME gpu-gles) -setup_hifi_library(Concurrent) +setup_hifi_library(Gui Concurrent) link_hifi_libraries(shared gl gpu) GroupSources("src") target_opengl() diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index fa5507fcf7..d58d41efe9 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include +#include #include #include #include @@ -764,7 +764,7 @@ void AddressManager::copyAddress() { } // assume that the address is being copied because the user wants a shareable address - QApplication::clipboard()->setText(currentShareableAddress().toString()); + QGuiApplication::clipboard()->setText(currentShareableAddress().toString()); } void AddressManager::copyPath() { @@ -773,7 +773,7 @@ void AddressManager::copyPath() { return; } - QApplication::clipboard()->setText(currentPath()); + QGuiApplication::clipboard()->setText(currentPath()); } QString AddressManager::getDomainId() const { diff --git a/libraries/plugins/CMakeLists.txt b/libraries/plugins/CMakeLists.txt index 6067c0fbed..1c0d74c45a 100644 --- a/libraries/plugins/CMakeLists.txt +++ b/libraries/plugins/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET_NAME plugins) -setup_hifi_library(OpenGL) +setup_hifi_library(Gui) link_hifi_libraries(shared networking) include_hifi_library_headers(gpu) diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt index 6be3057c93..57e3572012 100644 --- a/libraries/render-utils/CMakeLists.txt +++ b/libraries/render-utils/CMakeLists.txt @@ -2,7 +2,7 @@ set(TARGET_NAME render-utils) AUTOSCRIBE_SHADER_LIB(gpu graphics render) # pull in the resources.qrc file qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc") -setup_hifi_library(Widgets OpenGL Network Qml Quick Script) +setup_hifi_library(Gui Network Qml Quick Script) link_hifi_libraries(shared ktx gpu graphics model-networking render animation fbx image procedural) include_hifi_library_headers(networking) include_hifi_library_headers(octree) diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt index 478e4c4765..31436bbf8b 100644 --- a/libraries/script-engine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -1,4 +1,5 @@ set(TARGET_NAME script-engine) +# FIXME Move undo scripting interface to application and remove Widgets setup_hifi_library(Gui Network Script ScriptTools WebSockets Widgets) target_zlib() diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt index 3d61765988..92cebac869 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -1,7 +1,7 @@ set(TARGET_NAME shared) # TODO: there isn't really a good reason to have Script linked here - let's get what is requiring it out (RegisteredMetaTypes.cpp) -setup_hifi_library(Gui Network Script Widgets) +setup_hifi_library(Gui Network Script) if (WIN32) target_link_libraries(${TARGET_NAME} Wbemuuid.lib) diff --git a/libraries/trackers/src/trackers/EyeTracker.cpp b/libraries/trackers/src/trackers/EyeTracker.cpp index e641abc630..a64b945c55 100644 --- a/libraries/trackers/src/trackers/EyeTracker.cpp +++ b/libraries/trackers/src/trackers/EyeTracker.cpp @@ -9,7 +9,6 @@ #include "EyeTracker.h" #include -#include #include #include diff --git a/libraries/ui-plugins/CMakeLists.txt b/libraries/ui-plugins/CMakeLists.txt index 8da0815082..8f4123c1d4 100644 --- a/libraries/ui-plugins/CMakeLists.txt +++ b/libraries/ui-plugins/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET_NAME ui-plugins) -setup_hifi_library(OpenGL) +setup_hifi_library(Gui) link_hifi_libraries(shared plugins ui) include_hifi_library_headers(gpu) \ No newline at end of file diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt index 2dd23f5134..d16377587c 100644 --- a/libraries/ui/CMakeLists.txt +++ b/libraries/ui/CMakeLists.txt @@ -1,5 +1,5 @@ set(TARGET_NAME ui) -setup_hifi_library(OpenGL Multimedia Network Qml Quick Script WebChannel WebSockets XmlPatterns ${PLATFORM_QT_COMPONENTS}) +setup_hifi_library(Widgets Multimedia Network Qml Quick Script WebChannel WebSockets XmlPatterns ${PLATFORM_QT_COMPONENTS}) link_hifi_libraries(shared networking gl audio audio-client plugins pointers) include_hifi_library_headers(controllers) diff --git a/plugins/hifiCodec/src/HiFiCodec.cpp b/plugins/hifiCodec/src/HiFiCodec.cpp index f78bbae2c1..99bb411539 100644 --- a/plugins/hifiCodec/src/HiFiCodec.cpp +++ b/plugins/hifiCodec/src/HiFiCodec.cpp @@ -9,12 +9,11 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include +#include "HiFiCodec.h" #include #include -#include "HiFiCodec.h" const char* HiFiCodec::NAME { "hifiAC" }; diff --git a/plugins/hifiKinect/CMakeLists.txt b/plugins/hifiKinect/CMakeLists.txt index a7088eb3b4..97f78b0c11 100644 --- a/plugins/hifiKinect/CMakeLists.txt +++ b/plugins/hifiKinect/CMakeLists.txt @@ -10,7 +10,7 @@ if (WIN32) find_package(KINECT) if (KINECT_FOUND) set(TARGET_NAME hifiKinect) - setup_hifi_plugin(Script Qml Widgets) + setup_hifi_plugin(Qml) link_hifi_libraries(shared controllers ui plugins input-plugins display-plugins) # need to setup appropriate externals... diff --git a/plugins/hifiLeapMotion/CMakeLists.txt b/plugins/hifiLeapMotion/CMakeLists.txt index 14f9bbaa17..3075107bb3 100644 --- a/plugins/hifiLeapMotion/CMakeLists.txt +++ b/plugins/hifiLeapMotion/CMakeLists.txt @@ -9,7 +9,7 @@ find_package(LEAPMOTION) if (LEAPMOTION_FOUND) set(TARGET_NAME hifiLeapMotion) - setup_hifi_plugin(Script Qml Widgets) + setup_hifi_plugin(Qml) link_hifi_libraries(shared controllers ui plugins input-plugins) target_leapmotion() endif() diff --git a/plugins/hifiNeuron/CMakeLists.txt b/plugins/hifiNeuron/CMakeLists.txt index a9ed8cca6e..dd78b52240 100644 --- a/plugins/hifiNeuron/CMakeLists.txt +++ b/plugins/hifiNeuron/CMakeLists.txt @@ -9,7 +9,7 @@ if (APPLE OR WIN32) set(TARGET_NAME hifiNeuron) - setup_hifi_plugin(Script Qml Widgets) + setup_hifi_plugin(Qml) link_hifi_libraries(shared controllers ui plugins input-plugins) target_neuron() diff --git a/plugins/hifiSdl2/CMakeLists.txt b/plugins/hifiSdl2/CMakeLists.txt index 7e499e314a..8b2bb114a0 100644 --- a/plugins/hifiSdl2/CMakeLists.txt +++ b/plugins/hifiSdl2/CMakeLists.txt @@ -7,6 +7,6 @@ # set(TARGET_NAME hifiSdl2) -setup_hifi_plugin(Script Qml Widgets) +setup_hifi_plugin(Qml) link_hifi_libraries(shared controllers ui plugins input-plugins script-engine) target_sdl2() diff --git a/plugins/hifiSdl2/src/SDL2Manager.cpp b/plugins/hifiSdl2/src/SDL2Manager.cpp index a5376af24e..664e53d115 100644 --- a/plugins/hifiSdl2/src/SDL2Manager.cpp +++ b/plugins/hifiSdl2/src/SDL2Manager.cpp @@ -9,14 +9,15 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include +#include "SDL2Manager.h" + +#include #include #include #include #include -#include "SDL2Manager.h" static_assert( (int)controller::A == (int)SDL_CONTROLLER_BUTTON_A && diff --git a/plugins/hifiSixense/CMakeLists.txt b/plugins/hifiSixense/CMakeLists.txt index 6e642fce29..e84a4587c4 100644 --- a/plugins/hifiSixense/CMakeLists.txt +++ b/plugins/hifiSixense/CMakeLists.txt @@ -12,7 +12,7 @@ # the msvcr100 runtime support, the plugin will not load. if (NOT ANDROID) set(TARGET_NAME hifiSixense) - setup_hifi_plugin(Script Qml Widgets) + setup_hifi_plugin(Qml) link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins) target_sixense() if (WIN32) diff --git a/plugins/hifiSpacemouse/CMakeLists.txt b/plugins/hifiSpacemouse/CMakeLists.txt index bcfb309a69..174d0822ec 100644 --- a/plugins/hifiSpacemouse/CMakeLists.txt +++ b/plugins/hifiSpacemouse/CMakeLists.txt @@ -10,7 +10,7 @@ if(WIN32) set(TARGET_NAME hifiSpacemouse) find_package(3DCONNEXIONCLIENT) if (3DCONNEXIONCLIENT_FOUND) - setup_hifi_plugin(Script Qml Widgets) + setup_hifi_plugin(Qml) link_hifi_libraries(shared networking controllers ui plugins input-plugins) target_include_directories(${TARGET_NAME} PUBLIC ${3DCONNEXIONCLIENT_INCLUDE_DIRS}) target_link_libraries(${TARGET_NAME} ${3DCONNEXIONCLIENT_LIBRARIES}) diff --git a/plugins/openvr/CMakeLists.txt b/plugins/openvr/CMakeLists.txt index 3581009284..487a005068 100644 --- a/plugins/openvr/CMakeLists.txt +++ b/plugins/openvr/CMakeLists.txt @@ -10,7 +10,7 @@ if (WIN32 AND (NOT USE_GLES)) # we're using static GLEW, so define GLEW_STATIC add_definitions(-DGLEW_STATIC) set(TARGET_NAME openvr) - setup_hifi_plugin(OpenGL Script Qml Widgets Multimedia) + setup_hifi_plugin(Gui Qml Multimedia) link_hifi_libraries(shared gl networking controllers ui plugins display-plugins ui-plugins input-plugins script-engine audio-client render-utils graphics gpu render model-networking fbx ktx image procedural ${PLATFORM_GL_BACKEND}) diff --git a/plugins/pcmCodec/src/PCMCodecManager.cpp b/plugins/pcmCodec/src/PCMCodecManager.cpp index 7278edaf92..051f3973a8 100644 --- a/plugins/pcmCodec/src/PCMCodecManager.cpp +++ b/plugins/pcmCodec/src/PCMCodecManager.cpp @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include +#include #include diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt index 2092279159..7bc1349091 100644 --- a/tests/gpu-test/CMakeLists.txt +++ b/tests/gpu-test/CMakeLists.txt @@ -1,7 +1,7 @@ set(TARGET_NAME gpu-test) AUTOSCRIBE_SHADER_LIB(gpu graphics render-utils) # This is not a testcase -- just set it up as a regular hifi project -setup_hifi_project(Quick Gui OpenGL Script Widgets) +setup_hifi_project(Quick Gui Script) setup_memory_debugger() set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") link_hifi_libraries( diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt index 5314f7a45b..d377b7616d 100644 --- a/tests/render-perf/CMakeLists.txt +++ b/tests/render-perf/CMakeLists.txt @@ -8,7 +8,7 @@ endif() setup_memory_debugger() # This is not a testcase -- just set it up as a regular hifi project -setup_hifi_project(Quick Gui OpenGL) +setup_hifi_project(Quick Gui) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") # link in the shared libraries diff --git a/tests/render-texture-load/CMakeLists.txt b/tests/render-texture-load/CMakeLists.txt index dbfb7d33db..2ed905a3ef 100644 --- a/tests/render-texture-load/CMakeLists.txt +++ b/tests/render-texture-load/CMakeLists.txt @@ -8,7 +8,7 @@ endif() setup_memory_debugger() # This is not a testcase -- just set it up as a regular hifi project -setup_hifi_project(Quick Gui OpenGL) +setup_hifi_project(Quick Gui) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") # link in the shared libraries diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt index e3b1523a96..be75c53f2e 100644 --- a/tests/render-utils/CMakeLists.txt +++ b/tests/render-utils/CMakeLists.txt @@ -2,7 +2,7 @@ set(TARGET_NAME render-utils-test) # This is not a testcase -- just set it up as a regular hifi project -setup_hifi_project(Quick Gui OpenGL) +setup_hifi_project(Quick Gui) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") setup_memory_debugger() diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt index 76d2aa100c..44394db6a0 100644 --- a/tests/shaders/CMakeLists.txt +++ b/tests/shaders/CMakeLists.txt @@ -2,7 +2,7 @@ set(TARGET_NAME shaders-test) # This is not a testcase -- just set it up as a regular hifi project -setup_hifi_project(Quick Gui OpenGL) +setup_hifi_project(Quick Gui) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") setup_memory_debugger() diff --git a/tools/ac-client/CMakeLists.txt b/tools/ac-client/CMakeLists.txt index 24eeadba9c..ad16187dcb 100644 --- a/tools/ac-client/CMakeLists.txt +++ b/tools/ac-client/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET_NAME ac-client) -setup_hifi_project(Core Widgets) +setup_hifi_project(Core) setup_memory_debugger() link_hifi_libraries(shared networking) diff --git a/tools/ac-client/src/ACClientApp.h b/tools/ac-client/src/ACClientApp.h index e295b17654..d43e78eaeb 100644 --- a/tools/ac-client/src/ACClientApp.h +++ b/tools/ac-client/src/ACClientApp.h @@ -13,7 +13,7 @@ #ifndef hifi_ACClientApp_h #define hifi_ACClientApp_h -#include +#include #include #include #include diff --git a/tools/atp-client/CMakeLists.txt b/tools/atp-client/CMakeLists.txt index 4cee30bcc3..19c70597f7 100644 --- a/tools/atp-client/CMakeLists.txt +++ b/tools/atp-client/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET_NAME atp-client) -setup_hifi_project(Core Widgets) +setup_hifi_project(Core) setup_memory_debugger() link_hifi_libraries(shared networking) diff --git a/tools/atp-client/src/ATPClientApp.h b/tools/atp-client/src/ATPClientApp.h index a3904d6e50..eaf1043153 100644 --- a/tools/atp-client/src/ATPClientApp.h +++ b/tools/atp-client/src/ATPClientApp.h @@ -13,7 +13,7 @@ #ifndef hifi_ATPClientApp_h #define hifi_ATPClientApp_h -#include +#include #include #include #include diff --git a/tools/ice-client/CMakeLists.txt b/tools/ice-client/CMakeLists.txt index ae42d79f7e..64ec6b131d 100644 --- a/tools/ice-client/CMakeLists.txt +++ b/tools/ice-client/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET_NAME ice-client) -setup_hifi_project(Core Widgets) +setup_hifi_project(Core) setup_memory_debugger() link_hifi_libraries(shared networking) diff --git a/tools/ice-client/src/ICEClientApp.h b/tools/ice-client/src/ICEClientApp.h index de6b6abb14..642b9bc36b 100644 --- a/tools/ice-client/src/ICEClientApp.h +++ b/tools/ice-client/src/ICEClientApp.h @@ -13,7 +13,7 @@ #ifndef hifi_ICEClientApp_h #define hifi_ICEClientApp_h -#include +#include #include #include #include diff --git a/tools/skeleton-dump/CMakeLists.txt b/tools/skeleton-dump/CMakeLists.txt index 1c30e322d6..d0a6475c59 100644 --- a/tools/skeleton-dump/CMakeLists.txt +++ b/tools/skeleton-dump/CMakeLists.txt @@ -1,5 +1,5 @@ set(TARGET_NAME skeleton-dump) -setup_hifi_project(Core Widgets) +setup_hifi_project(Core) setup_memory_debugger() link_hifi_libraries(shared fbx graphics gpu gl animation) diff --git a/tools/skeleton-dump/src/SkeletonDumpApp.h b/tools/skeleton-dump/src/SkeletonDumpApp.h index 40df98eb65..272f7563fa 100644 --- a/tools/skeleton-dump/src/SkeletonDumpApp.h +++ b/tools/skeleton-dump/src/SkeletonDumpApp.h @@ -12,7 +12,7 @@ #ifndef hifi_SkeletonDumpApp_h #define hifi_SkeletonDumpApp_h -#include +#include class SkeletonDumpApp : public QCoreApplication { Q_OBJECT diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt index 599561bd2d..5ba8b7d971 100644 --- a/tools/vhacd-util/CMakeLists.txt +++ b/tools/vhacd-util/CMakeLists.txt @@ -1,5 +1,5 @@ set(TARGET_NAME vhacd-util) -setup_hifi_project(Core Widgets) +setup_hifi_project(Core) link_hifi_libraries(shared fbx graphics gpu gl) add_dependency_external_projects(vhacd) diff --git a/tools/vhacd-util/src/VHACDUtilApp.h b/tools/vhacd-util/src/VHACDUtilApp.h index ebb8164634..0d75275802 100644 --- a/tools/vhacd-util/src/VHACDUtilApp.h +++ b/tools/vhacd-util/src/VHACDUtilApp.h @@ -13,7 +13,7 @@ #ifndef hifi_VHACDUtilApp_h #define hifi_VHACDUtilApp_h -#include +#include #include