Merge mess...

Author: NissimHadar

CMakeLists.txt

@@ -81,7 +81,7 @@ if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
 else ()
-  set(PLATFORM_QT_COMPONENTS WebEngine Xml)
+  set(PLATFORM_QT_COMPONENTS WebEngine)
 endif ()
 
 if (USE_GLES AND (NOT ANDROID))

INSTALL.md

@@ -32,8 +32,8 @@ To produce an executable installer on Windows, the following are required:
 
 1. [InetC Plug-in for Nullsoft](http://nsis.sourceforge.net/Inetc_plug-in) - 1.0
     1. Extract Zip
-    1. Copy `Plugins\x86-ansi\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
-    1. Copy `Plugins\x86-unicode\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+    1. Copy `Plugin\x86-ansi\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+    1. Copy `Plugin\x86-unicode\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
 
 1. [NSISpcre Plug-in for Nullsoft](http://nsis.sourceforge.net/NSISpcre_plug-in) - 1.0
     1. Extract Zip

cmake/macros/FixupNitpick.cmake

@@ -77,9 +77,6 @@ macro(SET_PACKAGING_PARAMETERS)
     add_definitions(-DDEV_BUILD)
   endif ()
 
-  set(NITPICK_BUNDLE_NAME "nitpick")
-  set(NITPICK_ICON_PREFIX "nitpick")
-
   string(TIMESTAMP BUILD_TIME "%d/%m/%Y")
 
   # if STABLE_BUILD is 1, PRODUCTION_BUILD must be 1 and
@@ -143,9 +140,8 @@ macro(SET_PACKAGING_PARAMETERS)
 
     set(DMG_SUBFOLDER_ICON "${HF_CMAKE_DIR}/installer/install-folder.rsrc")
 
-    set(CONSOLE_INSTALL_DIR   ${DMG_SUBFOLDER_NAME})
+    set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
     set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
-    set(NITPICK_INSTALL_DIR   ${DMG_SUBFOLDER_NAME})
 
     if (CLIENT_ONLY)
       set(CONSOLE_EXEC_NAME "Console.app")
@@ -163,14 +159,11 @@ macro(SET_PACKAGING_PARAMETERS)
 
     set(INTERFACE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${INTERFACE_BUNDLE_NAME}.app")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
-    set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.icns")
   else ()
     if (WIN32)
       set(CONSOLE_INSTALL_DIR "server-console")
-      set(NITPICK_INSTALL_DIR "nitpick")
     else ()
       set(CONSOLE_INSTALL_DIR ".")
-      set(NITPICK_INSTALL_DIR ".")
     endif ()
 
     set(COMPONENT_INSTALL_DIR ".")
@@ -180,7 +173,6 @@ macro(SET_PACKAGING_PARAMETERS)
   if (WIN32)
     set(INTERFACE_EXEC_PREFIX "interface")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico")
-    set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.ico")
 
     set(CONSOLE_EXEC_NAME "server-console.exe")
 

cmake/macros/SetPackagingParameters.cmake

@@ -16,7 +16,7 @@
 #include <QObject>
 #include <QTextStream>
 
-#include "BusyWindow.h"
+#include "ui/BusyWindow.h"
 
 #include "PythonInterface.h"
 

tools/nitpick/compiledResources/resources.rcc

@@ -16,13 +16,13 @@
 PythonInterface::PythonInterface() {
 #ifdef Q_OS_WIN
     if (QProcessEnvironment::systemEnvironment().contains("PYTHON_PATH")) {
-        QString pythonPath = QProcessEnvironment::systemEnvironment().value("PYTHON_PATH");
-        if (!QFile::exists(pythonPath + "/" + _pythonExe)) {
-            QMessageBox::critical(0, _pythonExe, QString("Python executable not found in ") + pythonPath);
+        QString _pythonPath = QProcessEnvironment::systemEnvironment().value("PYTHON_PATH");
+        if (!QFile::exists(_pythonPath + "/" + _pythonExe)) {
+            QMessageBox::critical(0, _pythonExe, QString("Python executable not found in ") + _pythonPath);
             exit(-1);
         }
 
-        _pythonCommand = pythonPath + "/" + _pythonExe;
+        _pythonCommand = _pythonPath + "/" + _pythonExe;
     } else {
         QMessageBox::critical(0, "PYTHON_PATH not defined",
                               "Please set PYTHON_PATH to directory containing the Python executable");
@@ -31,7 +31,7 @@ PythonInterface::PythonInterface() {
 #elif defined Q_OS_MAC
     _pythonCommand = "/usr/local/bin/python3";
     if (!QFile::exists(_pythonCommand)) {
-        QMessageBox::critical(0, "python not found",
+        QMessageBox::critical(0, "PYTHON_PATH not defined",
                               "python3 not found at " + _pythonCommand);
         exit(-1);
     }

tools/nitpick/icon/nitpick.icns

@@ -19,7 +19,7 @@
 #include <quazip5/quazip.h>
 #include <quazip5/JlCompress.h>
 
-#include "Nitpick.h"
+#include "ui/Nitpick.h"
 extern Nitpick* nitpick;
 
 #include <math.h>

tools/nitpick/icon/nitpick.ico

@@ -18,7 +18,7 @@
 
 #include "AWSInterface.h"
 #include "ImageComparer.h"
-#include "MismatchWindow.h"
+#include "ui/MismatchWindow.h"
 #include "TestRailInterface.h"
 
 class Step {

tools/nitpick/src/AWSInterface.h

@@ -11,10 +11,10 @@
 #ifndef hifi_test_testrail_interface_h
 #define hifi_test_testrail_interface_h
 
-#include "BusyWindow.h"
-#include "TestRailTestCasesSelectorWindow.h"
-#include "TestRailRunSelectorWindow.h"
-#include "TestRailResultsSelectorWindow.h"
+#include "ui/BusyWindow.h"
+#include "ui/TestRailTestCasesSelectorWindow.h"
+#include "ui/TestRailRunSelectorWindow.h"
+#include "ui/TestRailResultsSelectorWindow.h"
 
 #include <QDirIterator>
 #include <QtXml/QDomDocument>