Changeset 59924 in vbox

Timestamp:

Mar 4, 2016 1:42:44 PM (9 years ago)

Author:

vboxsync

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

105858

Message:

FE/Qt: Qt5 migration (part 103): Preparing GUI via Qt5 installer for Win host.

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -548 +548 @@
                 -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)' \
@@ -634 +635 @@
                 -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

@@ -305 +305 @@
         </File>
     <?endif ?>
+    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
         <File Id="file_QtCoreVBox4.dll" Name="QtCoreVBox4.dll"
               Source="$(env.PATH_OUT)\bin\QtCoreVBox4.dll" />
         <File Id="file_QtGuiVBox4.dll" Name="QtGuiVBox4.dll"
               Source="$(env.PATH_OUT)\bin\QtGuiVBox4.dll" />
+    <?else ?>
+        <File Id="file_Qt5CoreVBox.dll" Name="Qt5CoreVBox.dll"
+              Source="$(env.PATH_OUT)\bin\Qt5CoreVBox.dll" />
+        <File Id="file_Qt5GuiVBox.dll" Name="Qt5GuiVBox.dll"
+              Source="$(env.PATH_OUT)\bin\Qt5GuiVBox.dll" />
+        <File Id="file_Qt5WidgetsVBox.dll" Name="Qt5WidgetsVBox.dll"
+              Source="$(env.PATH_OUT)\bin\Qt5WidgetsVBox.dll" />
+        <File Id="file_Qt5PrintSupportVBox.dll" Name="Qt5PrintSupportVBox.dll"
+              Source="$(env.PATH_OUT)\bin\Qt5PrintSupportVBox.dll" />
+        <File Id="file_Qt5WinExtrasVBox.dll" Name="Qt5WinExtrasVBox.dll"
+              Source="$(env.PATH_OUT)\bin\Qt5WinExtrasVBox.dll" />
+    <?endif ?>
 <?endif ?>
 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
@@ -317 +330 @@
 <?endif ?>
 <?if $(env.VBOX_GUI_USE_QGL) = "yes" ?>
+    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
         <File Id="file_QtOpenGLVBox4.dll" Name="QtOpenGLVBox4.dll"
               Source="$(env.PATH_OUT)\bin\QtOpenGLVBox4.dll" />
+    <?else ?>
+        <File Id="file_Qt5OpenGLVBox.dll" Name="Qt5OpenGLVBox.dll"
+              Source="$(env.PATH_OUT)\bin\Qt5OpenGLVBox.dll" />
+    <?endif ?>
 <?endif?>
 
@@ -360 +378 @@
 
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
-    <!-- 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>
-<?endif?>
+    <?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">
+            <Component Id="cp_QtPlatforms" Guid="842367ec-6094-4ddc-93d8-6ca70fc1ca24" Win64="$(var.Property_Win64)">
+                <File Id="file_qminimal.dll" Name="qminimal.dll"
+                      Source="$(env.PATH_OUT)\bin\platforms\qminimal.dll" />
+                <File Id="file_qoffscreen.dll" Name="qoffscreen.dll"
+                      Source="$(env.PATH_OUT)\bin\platforms\qoffscreen.dll" />
+                <File Id="file_qwindows.dll" Name="qwindows.dll"
+                      Source="$(env.PATH_OUT)\bin\platforms\qwindows.dll" />
+            </Component>
+        </Directory>
+    <?endif?>
+ <?endif ?>
 
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>

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

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