Changeset 72

Timestamp:

Mar 22, 2006, 4:31:22 PM (19 years ago)

Author:

dmik

Message:

The canvas module is added to the configure script and to the build.

Location:

trunk

Files:

• configure.cmd (modified) (5 diffs)
• src/kernel/qt_kernel.pri (modified) (1 diff)
• src/qt.pro (modified) (1 diff)

trunk/configure.cmd ¶

@@ -50 +50 @@
 Opt.!NETWORK    = 1
 Opt.!WORKSPACE  = 1
+Opt.!CANVAS     = 1
 Opt.!XML        = 1
 /* third party features */
@@ -236 +237 @@
     call WriteVar G.!ConfigCache, 'Opt.!NETWORK'
     call WriteVar G.!ConfigCache, 'Opt.!WORKSPACE'
+    call WriteVar G.!ConfigCache, 'Opt.!CANVAS'
     call WriteVar G.!ConfigCache, 'Opt.!XML'
 
@@ -459 +461 @@
     Opt.!RELEASE = -choice + 2
 
-    G.!Choices.0 = 3
+    G.!Choices.0 = 4
     do forever
         G.!Choices.1 = 'Network     'GetEnabledText(Opt.!NETWORK)
         G.!Choices.2 = 'Workspace   'GetEnabledText(Opt.!WORKSPACE)
-        G.!Choices.3 = 'XML         'GetEnabledText(Opt.!XML)
+        G.!Choices.3 = 'Canvas      'GetEnabledText(Opt.!CANVAS)
+        G.!Choices.4 = 'XML         'GetEnabledText(Opt.!XML)
         call SaySay 'Enable or disable optional Qt library modules'
         choice = GetChoice('(pressing Enter will accept the current selection):',,
@@ -470 +473 @@
             when choice == 1 then Opt.!NETWORK = \Opt.!NETWORK
             when choice == 2 then Opt.!WORKSPACE = \Opt.!WORKSPACE
-            when choice == 3 then Opt.!XML = \Opt.!XML
+            when choice == 3 then Opt.!CANVAS = \Opt.!CANVAS
+            when choice == 4 then Opt.!XML = \Opt.!XML
             otherwise leave
         end
@@ -509 +513 @@
         OptionalModules = OptionalModules 'workspace'
         ModulesHeader = ModulesHeader || '#define QT_MODULE_WORKSPACE'G.!EOL
+    end
+    if (Opt.!CANVAS == 1) then do
+        OptionalModules = OptionalModules 'canvas'
+        ModulesHeader = ModulesHeader || '#define QT_MODULE_CANVAS'G.!EOL
     end
     if (Opt.!XML == 1) then do

trunk/src/kernel/qt_kernel.pri ¶

@@ -284 +284 @@
         HEADERS -= \
                 $$KERNEL_P/qinputcontext_p.h \
-                $$KERNEL_H/qpolygonscanner.h \
                 $$KERNEL_H/qprinter.h \
                 $$KERNEL_H/qsessionmanager.h
 
         SOURCES -= \
-                $$KERNEL_CPP/qpolygonscanner.cpp \
                 $$KERNEL_CPP/qprinter.cpp
 }

trunk/src/qt.pro ¶

@@ -189 +189 @@
         include($$WORKSPACE_CPP/qt_workspace.pri)
         include($$NETWORK_CPP/qt_network.pri)
+        include($$CANVAS_CPP/qt_canvas.pri)
         include($$XML_CPP/qt_xml.pri)
         include($$KERNEL_CPP/qt_gfx.pri)