Changeset 200

Timestamp:

Jun 19, 2011, 6:07:07 PM (14 years ago)

Author:

rudi

Message:

Allow to include the SQL module. Note that this option is disabled by default, because we have not ported any sql driver.

Location:

trunk

Files:

• Makefile.os2-g++ (modified) (2 diffs)
• configure.cmd (modified) (6 diffs)
• src/qt.pro (modified) (3 diffs)

trunk/Makefile.os2-g++

@@ -110 +110 @@
 NETWORK_PH      = $(patsubst src/network/%,$(INCLUDE_PRIVATE)\\%,$(wildcard src/network/*_p.h))
 XML_PH          = $(patsubst src/xml/%,$(INCLUDE_PRIVATE)\\%,$(wildcard src/xml/*_p.h))
-PRIVATE_HEADERS         = $(KERNEL_PH) $(WIDGETS_PH) $(DIALOGS_PH) $(TOOLS_PH) $(CODECS_PH) $(STYLES_PH) $(NETWORK_PH) $(XML_PH)
+SQL_PH          = $(patsubst src/sql/%,$(INCLUDE_PRIVATE)\\%,$(wildcard src/sql/*_p.h))
+PRIVATE_HEADERS         = $(KERNEL_PH) $(WIDGETS_PH) $(DIALOGS_PH) $(TOOLS_PH) $(CODECS_PH) $(STYLES_PH) $(NETWORK_PH) $(XML_PH) $(SQL_PH)
 
 COPY_HEADER = @(if not exist $(INCLUDE_PRIVATE) mkdir $(INCLUDE_PRIVATE)) & \
@@ -131 +132 @@
 $(XML_PH): $(INCLUDE_PRIVATE)\\%.h: src\xml\\%.h
         $(COPY_HEADER)
+$(SQL_PH): $(INCLUDE_PRIVATE)\\%.h: src\sql\\%.h
+        $(COPY_HEADER)
 
 private_headers: $(PRIVATE_HEADERS)

trunk/configure.cmd

@@ -58 +58 @@
 Opt.!CANVAS     = 1
 Opt.!XML        = 1
+Opt.!SQL        = 0
 /* third party features */
 Opt.!ZLIB       = 1
@@ -293 +294 @@
     call WriteVar G.!ConfigCache, 'Opt.!CANVAS'
     call WriteVar G.!ConfigCache, 'Opt.!XML'
+    call WriteVar G.!ConfigCache, 'Opt.!SQL'
 
     call WriteVar G.!ConfigCache, 'Opt.!ZLIB'
@@ -606 +608 @@
     /* Optional Qt modules */
 
-    G.!Choices.0 = 6
+    G.!Choices.0 = 7
     do forever
         G.!Choices.1 = 'Network     'GetEnabledText(Opt.!NETWORK)
@@ -614 +616 @@
         G.!Choices.5 = 'Canvas      'GetEnabledText(Opt.!CANVAS)
         G.!Choices.6 = 'XML         'GetEnabledText(Opt.!XML)
+        G.!Choices.7 = 'SQL         'GetEnabledText(Opt.!SQL)
         call SaySay 'Enable or disable optional Qt library modules'
         choice = GetChoice('(pressing Enter will accept the current selection):',,
@@ -624 +627 @@
             when choice == 5 then Opt.!CANVAS = \Opt.!CANVAS
             when choice == 6 then Opt.!XML = \Opt.!XML
+            when choice == 7 then Opt.!SQL = \Opt.!SQL
             otherwise leave
         end
@@ -718 +722 @@
         OptionalModules = OptionalModules 'xml'
         ModulesHeader = ModulesHeader || '#define QT_MODULE_XML'G.!EOL
+    end
+    if (Opt.!SQL == 1) then do
+        OptionalModules = OptionalModules 'sql'
+        ModulesHeader = ModulesHeader || '#define QT_MODULE_SQL'G.!EOL
     end
     OptionalModules = strip(OptionalModules)

trunk/src/qt.pro

@@ -203 +203 @@
 
 #modules
-os2 {
-        # this section should be removed one day
-        # when an OS/2 version of every module is ready
         include($$KERNEL_CPP/qt_kernel.pri)
         include($$WIDGETS_CPP/qt_widgets.pri)
@@ -215 +212 @@
         include($$TABLE_CPP/qt_table.pri)
         include($$XML_CPP/qt_xml.pri)
-        include($$KERNEL_CPP/qt_gfx.pri)
-        include($$TOOLS_CPP/qt_tools.pri)
-        include($$CODECS_CPP/qt_codecs.pri)
-        include($$STYLES_CPP/qt_styles.pri)
-} else {
-        include($$KERNEL_CPP/qt_kernel.pri)
-        include($$WIDGETS_CPP/qt_widgets.pri)
-        include($$DIALOGS_CPP/qt_dialogs.pri)
-        include($$ICONVIEW_CPP/qt_iconview.pri)
-        include($$WORKSPACE_CPP/qt_workspace.pri)
-        include($$NETWORK_CPP/qt_network.pri)
-        include($$CANVAS_CPP/qt_canvas.pri)
-        include($$TABLE_CPP/qt_table.pri)
-        include($$XML_CPP/qt_xml.pri)
-        include($$OPENGL_CPP/qt_opengl.pri)
+!os2:   include($$OPENGL_CPP/qt_opengl.pri)
         include($$SQL_CPP/qt_sql.pri)
         include($$KERNEL_CPP/qt_gfx.pri)
@@ -235 +218 @@
         include($$CODECS_CPP/qt_codecs.pri)
         include($$STYLES_CPP/qt_styles.pri)
-}
+
 embedded:include($$EMBEDDED_CPP/qt_embedded.pri)