Changeset 71679 in vbox

Timestamp:

Apr 5, 2018 12:13:12 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: It actually appeared linking library mocs two times is incorrect (at least on Windows).

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -430 +430 @@
 #
 VirtualBox_QT_MOCHDRS = \
-        src/VBoxAboutDlg.h \
-        src/VBoxLicenseViewer.h \
         src/UITakeSnapshotDialog.h \
         src/extensions/QIAdvancedSlider.h \
-        src/extensions/QIArrowButtonPress.h \
-        src/extensions/QIArrowButtonSwitch.h \
-        src/extensions/QIArrowSplitter.h \
         src/extensions/QIComboBox.h \
-        src/extensions/QIDialog.h \
-        src/extensions/QIDialogButtonBox.h \
-        src/extensions/QIFileDialog.h \
         src/extensions/QIFlowLayout.h \
-        src/extensions/QILabel.h \
         src/extensions/QILabelSeparator.h \
         src/extensions/QIMainDialog.h \
-        src/extensions/QIMainWindow.h \
         src/extensions/QIManagerDialog.h \
         src/extensions/QIMenu.h \
-        src/extensions/QIMessageBox.h \
-        src/extensions/QIProcess.h \
-        src/extensions/QIRichTextLabel.h \
-        src/extensions/QIRichToolButton.h \
-        src/extensions/QISplitter.h \
         src/extensions/QIStatusBar.h \
-        src/extensions/QIStatusBarIndicator.h \
         src/extensions/QIStyledItemDelegate.h \
         src/extensions/QITabWidget.h \
         src/extensions/QITableView.h \
-        src/extensions/QIToolButton.h \
         src/extensions/QITreeView.h \
         src/extensions/QITreeWidget.h \
-        src/extensions/QIWidgetValidator.h \
         src/extensions/graphics/QIGraphicsView.h \
         src/extensions/graphics/QIGraphicsWidget.h \
-        src/extradata/UIExtraDataDefs.h \
-        src/extradata/UIExtraDataManager.h \
-        src/globals/UIActionPool.h \
-        src/globals/UIAnimationFramework.h \
-        src/globals/UIDesktopWidgetWatchdog.h \
-        src/globals/UIMainEventListener.h \
-        src/globals/UIMessageCenter.h \
-        src/globals/UIModalWindowManager.h \
-        src/globals/UIPopupCenter.h \
-        src/globals/UIShortcutPool.h \
         src/globals/UIStarter.h \
-        src/globals/UIThreadPool.h \
-        src/globals/VBoxGlobal.h \
-        src/globals/VBoxUtils.h \
         src/hostnetwork/UIHostNetworkDetailsWidget.h \
         src/hostnetwork/UIHostNetworkManager.h \
@@ -490 +459 @@
         src/logviewer/UIVMLogViewerWidget.h \
         src/medium/UIMediumDetailsWidget.h \
-        src/medium/UIMediumEnumerator.h \
         src/medium/UIMediumManager.h \
-        src/runtime/UIActionPoolRuntime.h \
         src/runtime/UIAddDiskEncryptionPasswordDialog.h \
         src/runtime/UIConsoleEventHandler.h \
@@ -541 +508 @@
         src/runtime/seamless/UIMachineViewSeamless.h \
         src/runtime/seamless/UIMachineWindowSeamless.h \
-        src/selector/UIActionPoolSelector.h \
         src/selector/UIDesktopPane.h \
         src/selector/UIVMItem.h \
-        src/selector/UIVirtualBoxEventHandler.h \
         src/selector/UISelectorWindow.h \
         src/selector/UISnapshotDetailsWidget.h \
@@ -600 +565 @@
         src/widgets/UIFilePathSelector.h \
         src/widgets/UIEmptyFilePathSelector.h \
-        src/widgets/UIHostComboEditor.h \
         src/widgets/UIHotKeyEditor.h \
         src/widgets/UILineTextEdit.h \
         src/widgets/UIMediumSizeEditor.h \
         src/widgets/UIMenuBar.h \
-        src/widgets/UIPopupBox.h \
-        src/widgets/UIPopupPane.h \
-        src/widgets/UIPopupPaneMessage.h \
-        src/widgets/UIPopupPaneDetails.h \
-        src/widgets/UIPopupPaneButtonPane.h \
-        src/widgets/UIPopupStack.h \
-        src/widgets/UIPopupStackViewport.h \
         src/widgets/UIPortForwardingTable.h \
-        src/widgets/UIProgressDialog.h \
         src/widgets/UISlidingWidget.h \
-        src/widgets/UISpecialControls.h \
         src/widgets/UITabBar.h \
-        src/widgets/UIToolBar.h \
         src/widgets/VBoxMediaComboBox.h \
         src/widgets/UIMenuToolBar.h \
@@ -668 +622 @@
 ifdef VBOX_GUI_WITH_NETWORK_MANAGER
  VirtualBox_QT_MOCHDRS += \
-        src/net/UIDownloader.h \
-        src/net/UIDownloaderAdditions.h \
-        src/net/UIDownloaderExtensionPack.h \
-        src/net/UIDownloaderUserManual.h \
-        src/net/UINetworkManager.h \
-        src/net/UINetworkManagerDialog.h \
-        src/net/UINetworkManagerIndicator.h \
-        src/net/UINetworkRequest.h \
-        src/net/UINetworkRequestWidget.h \
-        src/net/UINetworkReply.h \
-        src/net/UINetworkCustomer.h \
-        src/net/UIUpdateManager.h \
         src/settings/global/UIGlobalSettingsProxy.h \
         src/settings/global/UIGlobalSettingsUpdate.h
@@ -694 +636 @@
 
 VirtualBox_QT_MOCHDRS.darwin += \
-        src/platform/darwin/UICocoaSpecialControls.h \
         src/platform/darwin/UIWindowMenuManager.h
 
+ifndef VBOX_GUI_WITH_SHARED_LIBRARY
+ VirtualBox_QT_MOCHDRS += \
+        src/VBoxAboutDlg.h \
+        src/VBoxLicenseViewer.h \
+        src/extensions/QIArrowButtonPress.h \
+        src/extensions/QIArrowButtonSwitch.h \
+        src/extensions/QIArrowSplitter.h \
+        src/extensions/QIDialog.h \
+        src/extensions/QIDialogButtonBox.h \
+        src/extensions/QIFileDialog.h \
+        src/extensions/QILabel.h \
+        src/extensions/QIMainWindow.h \
+        src/extensions/QIMessageBox.h \
+        src/extensions/QIProcess.h \
+        src/extensions/QIRichTextLabel.h \
+        src/extensions/QIRichToolButton.h \
+        src/extensions/QISplitter.h \
+        src/extensions/QIStatusBarIndicator.h \
+        src/extensions/QIToolButton.h \
+        src/extensions/QIWidgetValidator.h \
+        src/extradata/UIExtraDataDefs.h \
+        src/extradata/UIExtraDataManager.h \
+        src/globals/UIActionPool.h \
+        src/globals/UIAnimationFramework.h \
+        src/globals/UIDesktopWidgetWatchdog.h \
+        src/globals/UIMainEventListener.h \
+        src/globals/UIMessageCenter.h \
+        src/globals/UIModalWindowManager.h \
+        src/globals/UIPopupCenter.h \
+        src/globals/UIShortcutPool.h \
+        src/globals/UIThreadPool.h \
+        src/globals/VBoxGlobal.h \
+        src/globals/VBoxUtils.h \
+        src/medium/UIMediumEnumerator.h \
+        src/runtime/UIActionPoolRuntime.h \
+        src/selector/UIActionPoolSelector.h \
+        src/selector/UIVirtualBoxEventHandler.h \
+        src/widgets/UIHostComboEditor.h \
+        src/widgets/UIPopupBox.h \
+        src/widgets/UIPopupPane.h \
+        src/widgets/UIPopupPaneButtonPane.h \
+        src/widgets/UIPopupPaneMessage.h \
+        src/widgets/UIPopupPaneDetails.h \
+        src/widgets/UIPopupStack.h \
+        src/widgets/UIPopupStackViewport.h \
+        src/widgets/UIProgressDialog.h \
+        src/widgets/UISpecialControls.h \
+        src/widgets/UIToolBar.h
+
+ ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+  VirtualBox_QT_MOCHDRS += \
+        src/net/UIDownloader.h \
+        src/net/UIDownloaderAdditions.h \
+        src/net/UIDownloaderExtensionPack.h \
+        src/net/UIDownloaderUserManual.h \
+        src/net/UINetworkCustomer.h \
+        src/net/UINetworkManager.h \
+        src/net/UINetworkManagerDialog.h \
+        src/net/UINetworkManagerIndicator.h \
+        src/net/UINetworkRequest.h \
+        src/net/UINetworkRequestWidget.h \
+        src/net/UINetworkReply.h \
+        src/net/UIUpdateManager.h
+ endif
+
+ VirtualBox_QT_MOCHDRS.darwin += \
+        src/platform/darwin/UICocoaSpecialControls.h
+endif
 
 #