Changeset 56181 in vbox

Timestamp:

Jun 1, 2015 1:51:23 PM (10 years ago)

Author:

vboxsync

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

100717

Message:

minimum version of Qt is 4.8.0

Location:

trunk

Files:

• configure (modified) (2 diffs)
• debian/rules (modified) (2 diffs)
• src/VBox/Installer/linux/debian/rules (modified) (1 diff)
• src/VBox/Installer/linux/rpm/rules (modified) (1 diff)

trunk/configure

@@ -1514 +1514 @@
 {
   printf("found version %s", QT_VERSION_STR);
-#if QT_VERSION >= 0x040602
+#if QT_VERSION >= 0x040800
   printf(", OK.\n");
   return 0;
 #else
-  printf(", expected version 4.6.2 or higher\n");
+  printf(", expected version 4.8.0 or higher\n");
   return 1;
 #endif
@@ -1547 +1547 @@
 {
   printf("found version %s", QT_VERSION_STR);
-#if QT_VERSION >= 0x040602
+#if QT_VERSION >= 0x040800
   printf(", OK.\n");
   return 0;
 #else
-  printf(", expected version 4.6.2 or higher\n");
+  printf(", expected version 4.8.0 or higher\n");
   return 1;
 #endif

trunk/debian/rules

@@ -69 +69 @@
 
 # Location of custom built Qt libraries (see below)
-qtstdc6  := /home/vbox/Qt-4.7.4-stdc++6-$(arch)
+qtstdc6  := /home/vbox/Qt-4.8.6-stdc++6-$(arch)
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
+             $(if $(filter _Debian_squeeze,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
@@ -86 +87 @@
              VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
              VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
+             $(if $(filter _Debian_squeeze _Ubuntu_lucid,$(debrel)),,VBOX_WITH_VMSVGA3D=1) \
              VBOX_DO_STRIP= \
              VBOX_WITH_MULTIVERSION_PYTHON= \

trunk/src/VBox/Installer/linux/debian/rules

@@ -92 +92 @@
 
 # Location of custom built Qt libraries (see below)
-qtstdc6  := /home/vbox/Qt-4.7.4-stdc++6-$(arch)
+qtstdc6  := /home/vbox/Qt-4.8.6-stdc++6-$(arch)
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
+             $(if $(filter _Debian_squeeze,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \

trunk/src/VBox/Installer/linux/rpm/rules

@@ -139 +139 @@
              $(if $(filter sles10.1,$(rpmrel)),--disable-pulse,) \
              $(if $(filter el5 ol5 centos5,$(rpmrel)),--enable-pulse,) \
-             $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
+             $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.8.6-stdc++6-$(arch)) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \