Changeset 8185 in vbox

Timestamp:

Apr 19, 2008 1:31:37 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed OSE build.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/Makefile.kmk (modified) (2 diffs)
• VirtualBox4/Makefile.kmk (modified) (3 diffs)

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

@@ -180 +180 @@
         include/VBoxProblemReporter.h \
         include/VBoxDownloaderWgt.h \
-        include/VBoxNetworkFramework.h \
-        include/VBoxAboutNonOSEDlg.h
+        include/VBoxNetworkFramework.h
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro
@@ -275 +274 @@
 VirtualBox_QT_IMAGES += images/about_sun.png
 VirtualBox_SOURCES += src/VBoxAboutNonOSEDlg.cpp
-else
+VirtualBox_QT_MOCHDRS += include/VBoxAboutNonOSEDlg.h
+endif
+# non-OSE version is always necessary for lupdate/lrelease
 VirtualBox_QT_UISRCS += ui/VBoxAboutDlg.ui
-endif
 
 ifneq ($(BUILD_TARGET),win)

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

@@ -258 +258 @@
 # filter ported UI content
 #
-VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxAboutDlg.ui,$(VirtualBox_QT_UISRCS3))
-VirtualBox_QT_UISRCS4 += ui/VBoxAboutDlg.ui
-
 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxCloseVMDlg.ui,$(VirtualBox_QT_UISRCS3))
 VirtualBox_QT_UISRCS4 += ui/VBoxCloseVMDlg.ui
@@ -438 +435 @@
         include/VBoxTakeSnapshotDlg.h \
         include/VBoxSnapshotsWgt.h \
-        include/VBoxVMLogViewer.h \
-        include/VBoxAboutNonOSEDlg.h
+        include/VBoxVMLogViewer.h
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro
@@ -725 +721 @@
 VirtualBox_QT_RC_OSE += $(shell $(SED) '/images/!d;{s/^.*\(images\/.*\)<.*$$/\1/}' VirtualBoxOSE.qrc)
 VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/qrc_application_ose.cpp
-VirtualBox_QT_UISRCS += ui/VBoxAboutDlg.ui
 else
 VirtualBox_QT_RC_NON_OSE += $(shell $(SED) '/images/!d;{s/^.*\(images\/.*\)<.*$$/\1/}' VirtualBoxNonOSE.qrc)
 VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/qrc_application_non_ose.cpp
 VirtualBox_SOURCES += src/VBoxAboutNonOSEDlg.cpp
-endif
+VirtualBox_QT_MOCHDRS += include/VBoxAboutNonOSEDlg.h
+endif
+
+# non-OSE version is always necessary for lupdate/lrelease
+VirtualBox_QT_UISRCS4 += ui/VBoxAboutDlg.ui
 
 # Commit the magic.