Changeset 67067 in vbox for trunk/src/VBox/Installer/win

Timestamp:

May 24, 2017 3:43:59 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115727

Message:

drop VBOX_WITH_QTGUI_V5 and friends

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (5 diffs)
• VirtualBox.wxs (modified) (1 diff)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -574 +574 @@
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
-                -E 'VBOX_WITH_QTGUI_V5=$(if $(VBOX_WITH_QTGUI_V5),yes,no)' \
                 -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
@@ -666 +665 @@
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
-                -E 'VBOX_WITH_QTGUI_V5=$(if $(VBOX_WITH_QTGUI_V5),yes,no)' \
                 -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -304 +304 @@
         </File>
     <?endif ?>
-    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
-        <File Id="file_QtCore$(var.VBOX_QT_INFIX)4.dll" Name="QtCore$(var.VBOX_QT_INFIX)4.dll"
-              Source="$(env.PATH_OUT)\bin\QtCore$(var.VBOX_QT_INFIX)4.dll" />
-        <File Id="file_QtGui$(var.VBOX_QT_INFIX)4.dll" Name="QtGui$(var.VBOX_QT_INFIX)4.dll"
-              Source="$(env.PATH_OUT)\bin\QtGui$(var.VBOX_QT_INFIX)4.dll" />
-    <?else ?>
         <File Id="file_Qt5Core$(var.VBOX_QT_INFIX).dll" Name="Qt5Core$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt5Core$(var.VBOX_QT_INFIX).dll" />
@@ -320 +314 @@
         <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" />
-    <?endif ?>
 <?endif ?>
 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
@@ -329 +322 @@
 <?endif ?>
 <?if $(env.VBOX_GUI_USE_QGL) = "yes" ?>
-    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
-        <File Id="file_QtOpenGL$(var.VBOX_QT_INFIX)4.dll" Name="QtOpenGL$(var.VBOX_QT_INFIX)4.dll"
-              Source="$(env.PATH_OUT)\bin\QtOpenGL$(var.VBOX_QT_INFIX)4.dll" />
-    <?else ?>
         <File Id="file_Qt5OpenGL$(var.VBOX_QT_INFIX).dll" Name="Qt5OpenGL$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt5OpenGL$(var.VBOX_QT_INFIX).dll" />
-    <?endif ?>
 <?endif?>
 
@@ -377 +365 @@
 
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
-    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
-        <!-- Qt accessible plugins -->
-        <Directory Id="dir_VBoxAppAccessible" Name="accessible">
-            <Component Id="cp_QtAccessible" Guid="12040EF9-D4A8-4FB2-A69C-CA2F5C354A45" Win64="$(var.Property_Win64)">
-                <File Id="file_qtaccessiblewidgets4.dll" Name="qtaccessiblewidgets4.dll"
-                      Source="$(env.PATH_OUT)\bin\accessible\qtaccessiblewidgets4.dll" />
-            </Component>
-        </Directory>
-    <?else ?>
         <!-- Qt platforms plugins -->
         <Directory Id="dir_VBoxAppPlatforms" Name="platforms">
@@ -397 +376 @@
             </Component>
         </Directory>
-    <?endif?>
- <?endif ?>
+<?endif ?>
 
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -439 +439 @@
         <ComponentRef Id="cp_MainBinaries" />
     <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
-        <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
-            <ComponentRef Id="cp_QtAccessible" />
-        <?else ?>
-            <ComponentRef Id="cp_QtPlatforms" />
-        <?endif?>
+        <ComponentRef Id="cp_QtPlatforms" />
     <?endif ?>
     <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>