Remove some unneeded Qt dependencies

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)

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

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}

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)

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)

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)

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

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

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 <QApplication>
+#include <QGuiApplication>
 #include <QClipboard>
 #include <QDebug>
 #include <QJsonDocument>
@@ -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 {

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)

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)

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

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)

libraries/trackers/src/trackers/EyeTracker.cpp

@@ -9,7 +9,6 @@
 #include "EyeTracker.h"
 
 #include <QFuture>
-#include <QMessageBox>
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <SharedUtil.h>

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)

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)
 

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 <qapplication.h>
+#include "HiFiCodec.h"
 
 #include <AudioCodec.h>
 #include <AudioConstants.h>
 
-#include "HiFiCodec.h"
 
 const char* HiFiCodec::NAME { "hifiAC" };
 

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...

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

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

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

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 <qapplication.h>
+#include "SDL2Manager.h"
+
+#include <QtCore/QCoreApplication>
 
 #include <controllers/UserInputMapper.h>
 #include <PerfStat.h>
 #include <Preferences.h>
 #include <SettingHandle.h>
 
-#include "SDL2Manager.h"
 
 static_assert(
     (int)controller::A == (int)SDL_CONTROLLER_BUTTON_A &&

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)

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

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

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 <qapplication.h>
+#include <QtCore/QCoreApplication>
 
 #include <PerfStat.h>
 

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(

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

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

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

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

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)

tools/ac-client/src/ACClientApp.h

@@ -13,7 +13,7 @@
 #ifndef hifi_ACClientApp_h
 #define hifi_ACClientApp_h
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <udt/Constants.h>
 #include <udt/Socket.h>
 #include <ReceivedMessage.h>

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)

tools/atp-client/src/ATPClientApp.h

@@ -13,7 +13,7 @@
 #ifndef hifi_ATPClientApp_h
 #define hifi_ATPClientApp_h
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <udt/Constants.h>
 #include <udt/Socket.h>
 #include <ReceivedMessage.h>

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)

tools/ice-client/src/ICEClientApp.h

@@ -13,7 +13,7 @@
 #ifndef hifi_ICEClientApp_h
 #define hifi_ICEClientApp_h
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <udt/Constants.h>
 #include <udt/Socket.h>
 #include <ReceivedMessage.h>

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)
 

tools/skeleton-dump/src/SkeletonDumpApp.h

@@ -12,7 +12,7 @@
 #ifndef hifi_SkeletonDumpApp_h
 #define hifi_SkeletonDumpApp_h
 
-#include <QApplication>
+#include <QCoreApplication>
 
 class SkeletonDumpApp : public QCoreApplication {
     Q_OBJECT

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)

tools/vhacd-util/src/VHACDUtilApp.h

@@ -13,7 +13,7 @@
 #ifndef hifi_VHACDUtilApp_h
 #define hifi_VHACDUtilApp_h
 
-#include <QApplication>
+#include <QCoreApplication>
 
 #include <FBXReader.h>