Changeset 10117 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 2, 2008 3:50:10 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Enabled Qt3Support library again. Too many errors on windows.

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (2 diffs)

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

@@ -87 +87 @@
 VBOX_PATH_QT4_SHARE      ?= $(VBOX_PATH_QT4)
 
-VBOX_MODULE_QT4     = QtCore QtGui 
-#QtNetwork
-VBOX_DEFS_QT4       = QT_CORE_LIB QT_GUI_LIB 
-#QT_NETWORK_LIB
+VBOX_MODULE_QT4     = QtCore QtGui QtNetwork
+VBOX_DEFS_QT4       = QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB
 # @todo: remove later: this is necessary only as long as Qt3Support is necessary
 # (it links to them)
-#VBOX_MODULE_QT4    += Qt3Support QtSql QtXml
-#VBOX_DEFS_QT4      += QT_QT3SUPPORT_LIB QT_SQL_LIB QT_XML_LIB
+VBOX_MODULE_QT4    += Qt3Support QtSql QtXml
+VBOX_DEFS_QT4      += QT_QT3SUPPORT_LIB QT_SQL_LIB QT_XML_LIB
 
 ifeq ($(KBUILD_TARGET),darwin)
@@ -139 +137 @@
 #VBOX_DEFS_QT4 += QT3_SUPPORT_WARNINGS
 # Some default defs
-#VBOX_DEFS_QT4 += QT3_SUPPORT QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG
-VBOX_DEFS_QT4 += QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG
+VBOX_DEFS_QT4 += QT3_SUPPORT QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG
+#VBOX_DEFS_QT4 += QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG
 
 VBOX_UIC4      ?= $(VBOX_PATH_QT4_BIN)/uic