[Kde-cygwin-cvs] CVS: qt-3/src qt.pro,1.1.1.19,1.1.1.20

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19338/src

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qt.pro 
Log Message:


Index: qt.pro
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/qt.pro,v
retrieving revision 1.1.1.19
retrieving revision 1.1.1.20
diff -u -r1.1.1.19 -r1.1.1.20
--- qt.pro	22 Sep 2005 12:53:40 -0000	1.1.1.19
+++ qt.pro	23 Sep 2005 11:16:18 -0000	1.1.1.20
@@ -2,7 +2,7 @@
 TEMPLATE	= lib
 TARGET		= qt
 embedded:TARGET	= qte
-VERSION		= 3.3.5
+VERSION		= 3
 DESTDIR		= $$QMAKE_LIBDIR_QT
 DLLDESTDIR	= ../bin
 
@@ -100,7 +100,7 @@
 	WORKSPACE_H	= $$WORKSPACE_CPP
 	XML_H		= $$XML_CPP
 	STYLES_H	= $$STYLES_CPP
-	!embedded:!mac:CONFIG	   += x11 x11inc
+	!embedded:!mac:!win32:CONFIG	   += x11 x11inc
 }
 
 aix-g++ {
@@ -152,7 +152,23 @@
 include($$TABLE_CPP/qt_table.pri)
 include($$XML_CPP/qt_xml.pri)
 include($$OPENGL_CPP/qt_opengl.pri)
-include($$SQL_CPP/qt_sql.pri)
+
+qt-sql-lib: {
+	TARGETDEPS=qt_sql
+	mytarget.target = qt_sql
+	mytarget.commands = cd sql && $(MAKE)
+	win32 { 
+		LIBS += qt_sql.lib
+		QMAKE_EXTRA_WIN_TARGETS = mytarget
+	}
+	unix {
+		LIBS += -lqt_sql
+		QMAKE_EXTRA_UNIX_TARGETS = mytarget
+	}
+}
+else {
+	include($$SQL_CPP/qt_sql.pri)
+}
 include($$KERNEL_CPP/qt_gfx.pri)
 include($$TOOLS_CPP/qt_tools.pri)
 include($$CODECS_CPP/qt_codecs.pri)