Fixed ICE-4802: deprecated Qt/SQL database plugins for IceGrid and IceStorm

9 files changed, 34 insertions, 31 deletions

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 892b78b413b..adae419a5c5 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -117,8 +117,8 @@ USE_READLINE		?= no
 #READLINE_HOME		?= /opt/readline
 
 #
-# If you want to build the SQL database plugins for IceStorm and
-# IceGrid, set QT_HOME to the Qt installation directory.
+# If you want to build the deprecated SQL database plugins for IceStorm 
+# and IceGrid, set QT_HOME to the Qt installation directory.
 #
 #
 #QT_HOME	= /usr/local/Trolltech/Qt-4.5.3
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 0b6e105bee9..509954efa86 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -103,15 +103,6 @@ ifeq ($(DB_HOME),)
    endif
 endif
 
-ifneq ($(QT_HOME),)
-   ifneq ($(QT_HOME), /Library/Frameworks)
-      # Frameworks are installed in the lib directory
-      QT_FLAGS             = -F$(QT_HOME)/lib
-      QT_LIBS              = -F$(QT_HOME)/lib
-   endif
-   QT_LIBS := $(QT_LIBS) -framework QtCore -framework QtSql
-endif
-
 BASELIBS		= -lIceUtil -lpthread 
 LIBS			= -lIce $(BASELIBS)
 
@@ -121,3 +112,15 @@ ICEUTIL_OS_LIBS         = -lpthread
 ICE_OS_LIBS             = -ldl
 
 PLATFORM_HAS_READLINE   := no
+
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
+ifneq ($(QT_HOME),)
+   ifneq ($(QT_HOME), /Library/Frameworks)
+      # Frameworks are installed in the lib directory
+      QT_FLAGS             = -F$(QT_HOME)/lib
+      QT_LIBS              = -F$(QT_HOME)/lib
+   endif
+   QT_LIBS := $(QT_LIBS) -framework QtCore -framework QtSql
+endif
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 9e0128f6712..269fea15a03 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -152,14 +152,17 @@ endif
 
 LIBS			= $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
 
-ifneq ($(QT_HOME),)
-   QT_FLAGS             = -I$(QT_HOME)/include
-   QT_LIBS              = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql
-   QT_RPATH_LINK        = $(call rpathlink,$(QT_HOME)/$(libsubdir))
-endif
-
 ICEUTIL_OS_LIBS         = 
 ICE_OS_LIBS             = -ldl
 
 PLATFORM_HAS_READLINE   = yes
 
+
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
+ifneq ($(QT_HOME),)
+   QT_FLAGS             = -I$(QT_HOME)/include
+   QT_LIBS              = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql
+   QT_RPATH_LINK        = $(call rpathlink,$(QT_HOME)/$(libsubdir))
+endif
\ No newline at end of file
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index 82bc335d3e7..18df843d00d 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -114,10 +114,13 @@ rpathlink                   = -L$(1)
 BASELIBS		    = -lIceUtil -lpthread
 LIBS			    = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
 
+ICEUTIL_OS_LIBS		    = -lpthread -lrt
+ICE_OS_LIBS		    = -ldl -lsocket
+
+#
+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins
+#
 ifneq ($(QT_HOME),)
    QT_FLAGS                 = -I$(QT_HOME)/include
    QT_LIBS                  = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql
 endif
-
-ICEUTIL_OS_LIBS		    = -lpthread -lrt
-ICE_OS_LIBS		    = -ldl -lsocket
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 83439a59818..c026e3aafce 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -146,6 +146,9 @@ RCFLAGS		= -D_DEBUG
 OPENSSL_LIBS            = ssleay32.lib libeay32.lib

 EXPAT_LIBS              = libexpat.lib

 

+#

+# QT is used only for the deprecated IceGrid and IceStorm SQL plugins

+#

 QT_LIBS			= QtSql$(LIBSUFFIX)4.lib QtCore$(LIBSUFFIX)4.lib

 

 CPPFLAGS		= $(CPPFLAGS) -I"$(includedir)"

diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 6fbab02e7f7..b4593c58dfd 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -118,9 +118,6 @@ install:: all
 	$(call installprogram,$(REGISTRY_SERVER),$(install_bindir))
 
 SUBDIRS = FreezeDB
-ifneq ($(QT_HOME),)
-   SUBDIRS += SqlDB
-endif
 
 $(EVERYTHING)::
 	@for subdir in $(SUBDIRS); \
@@ -132,7 +129,4 @@ $(EVERYTHING)::
 	    fi; \
 	done
 
-# Needed for make -jn to work.
-#../IceGrid/Grammar.y: Grammar.h
-
 include .depend
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index f9e582fa235..2dfa2e32adb 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -162,7 +162,7 @@ install:: all
 

 !endif

 

-SUBDIRS = FreezeDB SqlDB

+SUBDIRS = FreezeDB

 

 $(EVERYTHING)::

 	@for %i in ( $(SUBDIRS) ) do \

diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 87b811f61de..af2b258aae2 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -88,9 +88,6 @@ install:: all
 	$(call installprogram,$(ADMIN),$(install_bindir))
 
 SUBDIRS = FreezeDB
-ifneq ($(QT_HOME),)
-   SUBDIRS += SqlDB
-endif
 
 $(EVERYTHING)::
 	@for subdir in $(SUBDIRS); \
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 0390adbde8f..b571d90af62 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -119,7 +119,7 @@ install:: all
 

 !endif

 

-SUBDIRS = FreezeDB SqlDB

+SUBDIRS = FreezeDB

 

 $(EVERYTHING)::

 	@for %i in ( $(SUBDIRS) ) do \