Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/Projection Designer.sln
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/Projection Designer.sln	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/Projection Designer.sln	(revision 42)
@@ -1,8 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projdesigner", "projdesigner\projdesigner.vcproj", "{4418A7F1-9C0E-31B2-B8A2-913D1394330B}"
-	GlobalSection(Qt) = preSolution
-		Integration = True
-	EndGlobalSection
 	ProjectSection(ProjectDependencies) = postProject
 		{6169FA3C-3764-3D1A-80FC-D97551D6C7AC} = {6169FA3C-3764-3D1A-80FC-D97551D6C7AC}
@@ -10,7 +7,4 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projdesigner_default", "projdesignerplugins\defaultplugin\projdesigner_default.vcproj", "{6169FA3C-3764-3D1A-80FC-D97551D6C7AC}"
-	GlobalSection(Qt) = preSolution
-		Integration = True
-	EndGlobalSection
 EndProject
 Global
@@ -25,10 +19,14 @@
 		{4418A7F1-9C0E-31B2-B8A2-913D1394330B}.Release|Win32.Build.0 = Release|Win32
 		{6169FA3C-3764-3D1A-80FC-D97551D6C7AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6169FA3C-3764-3D1A-80FC-D97551D6C7AC}.Debug|Win32.Build.0 = Debug|Win32
 		{6169FA3C-3764-3D1A-80FC-D97551D6C7AC}.Release|Win32.ActiveCfg = Release|Win32
-		{6169FA3C-3764-3D1A-80FC-D97551D6C7AC}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Qt) = preSolution
+		Integration = True
+	EndGlobalSection
+	GlobalSection(Qt) = preSolution
+		Integration = True
+	EndGlobalSection
 EndGlobal
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelmanagerwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelmanagerwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelmanagerwidget.ui	(revision 42)
@@ -1,92 +1,89 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QChannelManagerWidget</class>
- <widget class="QWidget" name="QChannelManagerWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QChannelManagerWidget">
+  <property name="geometry">
    <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>223</width>
-	<height>236</height>
+    <x>0</x>
+    <y>0</y>
+    <width>223</width>
+    <height>236</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Channel Manager</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
-	<number>0</number>
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
    </property>
-   <property name="spacing" >
-	<number>6</number>
+   <property name="margin">
+    <number>0</number>
    </property>
    <item>
-	<layout class="QVBoxLayout" >
-	 <property name="margin" >
-	  <number>0</number>
-	 </property>
-	 <property name="spacing" >
-	  <number>6</number>
-	 </property>
-	 <item>
-	  <widget class="QTableWidget" name="channelTable" >
-	   <property name="selectionMode" >
-		<enum>QAbstractItemView::SingleSelection</enum>
-	   </property>
-	   <property name="selectionBehavior" >
-		<enum>QAbstractItemView::SelectRows</enum>
-	   </property>
-	  </widget>
-	 </item>
-	 <item>
-	  <layout class="QHBoxLayout" >
-	   <property name="margin" >
-		<number>0</number>
-	   </property>
-	   <property name="spacing" >
-		<number>6</number>
-	   </property>
-	   <item>
-		<spacer>
-		 <property name="orientation" >
-		  <enum>Qt::Horizontal</enum>
-		 </property>
-		 <property name="sizeHint" >
-		  <size>
-		   <width>16</width>
-		   <height>20</height>
-		  </size>
-		 </property>
-		</spacer>
-	   </item>
-	   <item>
-		<widget class="QPushButton" name="addButton" >
-		 <property name="focusPolicy" >
-		  <enum>Qt::NoFocus</enum>
-		 </property>
-		 <property name="text" >
-		  <string>Add</string>
-		 </property>
-		</widget>
-	   </item>
-	   <item>
-		<widget class="QPushButton" name="removeButton" >
-		 <property name="focusPolicy" >
-		  <enum>Qt::NoFocus</enum>
-		 </property>
-		 <property name="text" >
-		  <string>Remove</string>
-		 </property>
-		</widget>
-	   </item>
-	  </layout>
-	 </item>
-	</layout>
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QTableWidget" name="channelTable">
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>16</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="addButton">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="text">
+          <string>Add</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="removeButton">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="text">
+          <string>Remove</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelwidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QChannelWidget</class>
- <widget class="QWidget" name="QChannelWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QChannelWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,25 +11,25 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Channel Settings</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="nameLabel" >
-       <property name="text" >
+      <widget class="QLabel" name="nameLabel">
+       <property name="text">
         <string>Name</string>
        </property>
@@ -36,12 +37,12 @@
      </item>
      <item>
-      <widget class="QLineEdit" name="nameEdit" />
+      <widget class="QLineEdit" name="nameEdit"/>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -54,26 +55,26 @@
    </item>
    <item>
-    <widget class="QGroupBox" name="overlayGroupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="overlayGroupBox">
+     <property name="title">
       <string>Overlay</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="spacing" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin" >
+      <property name="margin">
        <number>4</number>
       </property>
       <item>
-       <layout class="QVBoxLayout" >
-        <property name="spacing" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>0</number>
         </property>
         <item>
-         <widget class="QCheckBox" name="overlayNameCheckBox" >
-          <property name="text" >
+         <widget class="QCheckBox" name="overlayNameCheckBox">
+          <property name="text">
            <string>Channel name</string>
           </property>
@@ -81,14 +82,14 @@
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QLabel" name="overlayImageLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="overlayImageLabel">
+            <property name="text">
              <string>Image</string>
             </property>
@@ -96,7 +97,7 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="overlayImageEdit" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <widget class="QLineEdit" name="overlayImageEdit">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
@@ -106,12 +107,12 @@
           </item>
           <item>
-           <widget class="QPushButton" name="overlayImageBrowseButton" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <widget class="QPushButton" name="overlayImageBrowseButton">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="maximumSize" >
+            <property name="maximumSize">
              <size>
               <width>23</width>
@@ -119,5 +120,5 @@
              </size>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>...</string>
             </property>
@@ -132,49 +133,49 @@
    </item>
    <item>
-    <widget class="QToolBox" name="toolBox" >
-     <property name="autoFillBackground" >
+    <widget class="QToolBox" name="toolBox">
+     <property name="autoFillBackground">
       <bool>true</bool>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>1</number>
      </property>
-     <widget class="QWidget" name="page" >
-      <property name="geometry" >
+     <widget class="QWidget" name="page">
+      <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>232</width>
-        <height>198</height>
+        <width>158</width>
+        <height>58</height>
        </rect>
       </property>
-      <attribute name="label" >
+      <attribute name="label">
        <string>Remote Settings</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="spacing" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
+          <layout class="QHBoxLayout">
+           <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin" >
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QLabel" name="remoteHostNameLabel" >
-             <property name="text" >
+            <widget class="QLabel" name="remoteHostNameLabel">
+             <property name="text">
               <string>Host name</string>
              </property>
@@ -182,19 +183,19 @@
            </item>
            <item>
-            <widget class="QLineEdit" name="remoteHostNameEdit" />
+            <widget class="QLineEdit" name="remoteHostNameEdit"/>
            </item>
           </layout>
          </item>
          <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
+          <layout class="QHBoxLayout">
+           <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin" >
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QCheckBox" name="remoteFullScreenCheckBox" >
-             <property name="text" >
+            <widget class="QCheckBox" name="remoteFullScreenCheckBox">
+             <property name="text">
               <string>Full screen</string>
              </property>
@@ -202,6 +203,6 @@
            </item>
            <item>
-            <widget class="QLabel" name="remoteScreenLabel" >
-             <property name="text" >
+            <widget class="QLabel" name="remoteScreenLabel">
+             <property name="text">
               <string> Screen</string>
              </property>
@@ -209,22 +210,22 @@
            </item>
            <item>
-            <widget class="QComboBox" name="remoteScreenComboBox" >
+            <widget class="QComboBox" name="remoteScreenComboBox">
              <item>
-              <property name="text" >
+              <property name="text">
                <string>1</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>2</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>3</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>4</string>
               </property>
@@ -236,8 +237,8 @@
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -251,34 +252,34 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="page_2" >
-      <property name="geometry" >
+     <widget class="QWidget" name="page_2">
+      <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>232</width>
-        <height>262</height>
+        <height>267</height>
        </rect>
       </property>
-      <attribute name="label" >
+      <attribute name="label">
        <string>Projector</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
+        <layout class="QHBoxLayout">
+         <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <widget class="QLabel" name="pluginLabel" >
-           <property name="text" >
+          <widget class="QLabel" name="pluginLabel">
+           <property name="text">
             <string>Plugin</string>
            </property>
@@ -286,12 +287,12 @@
          </item>
          <item>
-          <widget class="QComboBox" name="pluginComboBox" />
+          <widget class="QComboBox" name="pluginComboBox"/>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
@@ -304,6 +305,6 @@
        </item>
        <item>
-        <widget class="QStackedWidget" name="stackedWidget" >
-         <property name="minimumSize" >
+        <widget class="QStackedWidget" name="stackedWidget">
+         <property name="minimumSize">
           <size>
            <width>0</width>
@@ -314,6 +315,6 @@
        </item>
        <item>
-        <widget class="projection::QTransformMatrixWidget" native="1" name="projectionTransformWidget" >
-         <property name="focusPolicy" >
+        <widget class="projection::QTransformMatrixWidget" name="projectionTransformWidget" native="true">
+         <property name="focusPolicy">
           <enum>Qt::StrongFocus</enum>
          </property>
@@ -321,26 +322,26 @@
        </item>
        <item>
-        <widget class="QGroupBox" name="warpGroupBox" >
-         <property name="title" >
+        <widget class="QGroupBox" name="warpGroupBox">
+         <property name="title">
           <string>Warp</string>
          </property>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>4</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QCheckBox" name="warpCheckBox" >
-              <property name="text" >
+             <widget class="QCheckBox" name="warpCheckBox">
+              <property name="text">
                <string>Enable</string>
               </property>
@@ -348,6 +349,6 @@
             </item>
             <item>
-             <widget class="QLabel" name="warpResLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="warpResLabel">
+              <property name="text">
                <string>Res.</string>
               </property>
@@ -355,6 +356,6 @@
             </item>
             <item>
-             <widget class="QSpinBox" name="warpResSpinBox" >
-              <property name="maximumSize" >
+             <widget class="QSpinBox" name="warpResSpinBox">
+              <property name="maximumSize">
                <size>
                 <width>32</width>
@@ -362,8 +363,8 @@
                </size>
               </property>
-              <property name="minimum" >
+              <property name="minimum">
                <number>2</number>
               </property>
-              <property name="maximum" >
+              <property name="maximum">
                <number>8</number>
               </property>
@@ -371,6 +372,6 @@
             </item>
             <item>
-             <widget class="QPushButton" name="warpResetButton" >
-              <property name="maximumSize" >
+             <widget class="QPushButton" name="warpResetButton">
+              <property name="maximumSize">
                <size>
                 <width>50</width>
@@ -378,5 +379,5 @@
                </size>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Reset</string>
               </property>
@@ -389,17 +390,17 @@
        </item>
        <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
+        <layout class="QHBoxLayout">
+         <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
@@ -410,9 +411,9 @@
          </item>
          <item>
-          <widget class="QPushButton" name="calibrateButton" >
-           <property name="enabled" >
+          <widget class="QPushButton" name="calibrateButton">
+           <property name="enabled">
             <bool>false</bool>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>Calibrate...</string>
            </property>
@@ -423,8 +424,8 @@
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -436,34 +437,34 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="page_3" >
-      <property name="geometry" >
+     <widget class="QWidget" name="page_3">
+      <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>232</width>
-        <height>349</height>
+        <width>98</width>
+        <height>28</height>
        </rect>
       </property>
-      <attribute name="label" >
+      <attribute name="label">
        <string>View</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="spacing" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <widget class="projection::QProjectionMatrixWidget" native="1" name="viewProjectionWidget" >
-           <property name="focusPolicy" >
+          <widget class="projection::QProjectionMatrixWidget" name="viewProjectionWidget" native="true">
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -471,6 +472,6 @@
          </item>
          <item>
-          <widget class="projection::QTransformMatrixWidget" native="1" name="viewTransformWidget" >
-           <property name="focusPolicy" >
+          <widget class="projection::QTransformMatrixWidget" name="viewTransformWidget" native="true">
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -478,17 +479,17 @@
          </item>
          <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
+          <layout class="QHBoxLayout">
+           <property name="spacing">
             <number>0</number>
            </property>
-           <property name="margin" >
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
             <spacer>
-             <property name="orientation" >
+             <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0" >
+             <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
@@ -499,9 +500,9 @@
            </item>
            <item>
-            <widget class="QPushButton" name="fitButton" >
-             <property name="enabled" >
+            <widget class="QPushButton" name="fitButton">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="text" >
+             <property name="text">
               <string>Fit to Projector</string>
              </property>
@@ -512,8 +513,8 @@
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -531,11 +532,11 @@
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>190</width>
@@ -546,17 +547,17 @@
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -567,15 +568,15 @@
      </item>
      <item>
-      <widget class="QPushButton" name="windowButton" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+      <widget class="QPushButton" name="windowButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="focusPolicy" >
+       <property name="focusPolicy">
         <enum>Qt::NoFocus</enum>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Open Window...</string>
        </property>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qclientwindow.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qclientwindow.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qclientwindow.ui	(revision 42)
@@ -1,9 +1,7 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QClientWindow</class>
- <widget class="QMainWindow" name="QClientWindow" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="QClientWindow">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,24 +11,24 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Designer</string>
   </property>
-  <widget class="QWidget" name="centralWidget" >
-   <layout class="QHBoxLayout" >
-    <property name="margin" >
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout">
+    <property name="spacing">
+     <number>6</number>
+    </property>
+    <property name="margin">
      <number>2</number>
     </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <item>
-     <widget class="QTextEdit" name="logEdit" >
-      <property name="acceptDrops" >
+     <widget class="QTextEdit" name="logEdit">
+      <property name="acceptDrops">
        <bool>false</bool>
       </property>
-      <property name="readOnly" >
+      <property name="readOnly">
        <bool>true</bool>
       </property>
-      <property name="acceptRichText" >
+      <property name="acceptRichText">
        <bool>false</bool>
       </property>
@@ -39,28 +37,27 @@
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menuBar" >
-   <property name="geometry" >
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>344</width>
-     <height>18</height>
+     <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
      <string>&amp;File</string>
     </property>
-    <addaction name="actionFileExit" />
+    <addaction name="actionFileExit"/>
    </widget>
-   <addaction name="menu_File" />
+   <addaction name="menu_File"/>
   </widget>
-  <action name="actionFileExit" >
-   <property name="text" >
+  <action name="actionFileExit">
+   <property name="text">
     <string>E&amp;xit</string>
    </property>
   </action>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qdesignviewwindow.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qdesignviewwindow.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qdesignviewwindow.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QDesignViewWindow</class>
- <widget class="QMainWindow" name="QDesignViewWindow" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="QDesignViewWindow">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,27 +11,27 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Designer</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../../projdesigner.qrc" >
+  <property name="windowIcon">
+   <iconset resource="../../projdesigner.qrc">
     <normaloff>:/new/prefix1/Resources/projDesigner.png</normaloff>:/new/prefix1/Resources/projDesigner.png</iconset>
   </property>
-  <widget class="QWidget" name="centralWidget" >
-   <layout class="QHBoxLayout" >
-    <property name="spacing" >
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout">
+    <property name="spacing">
      <number>6</number>
     </property>
-    <property name="margin" >
+    <property name="margin">
      <number>0</number>
     </property>
     <item>
-     <widget class="QSplitter" name="splitter" >
-      <property name="orientation" >
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="projection::QDesignViewWidget" native="1" name="designViewWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Ignored" >
+      <widget class="projection::QDesignViewWidget" name="designViewWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="MinimumExpanding">
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
@@ -38,7 +39,7 @@
        </property>
       </widget>
-      <widget class="projection::QPanelWidget" native="1" name="panelWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+      <widget class="projection::QPanelWidget" name="panelWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
@@ -50,331 +51,331 @@
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menuBar" >
-   <property name="geometry" >
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>960</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuEdit" >
-    <property name="title" >
+   <widget class="QMenu" name="menuEdit">
+    <property name="title">
      <string>&amp;Edit</string>
     </property>
-    <addaction name="actionEditDesignDistortionMap" />
-    <addaction name="actionEditDesignBlendMap" />
-    <addaction name="separator" />
-    <addaction name="actionEditPreference" />
+    <addaction name="actionEditDesignDistortionMap"/>
+    <addaction name="actionEditDesignBlendMap"/>
+    <addaction name="separator"/>
+    <addaction name="actionEditPreference"/>
    </widget>
-   <widget class="QMenu" name="menuView" >
-    <property name="title" >
+   <widget class="QMenu" name="menuView">
+    <property name="title">
      <string>&amp;View</string>
     </property>
-    <addaction name="actionViewPerspective" />
-    <addaction name="actionViewCenter" />
-    <addaction name="actionViewFront" />
-    <addaction name="actionViewTop" />
-    <addaction name="actionViewSide" />
-    <addaction name="separator" />
-    <addaction name="actionViewAxis" />
-    <addaction name="actionViewGrid" />
-    <addaction name="actionViewInfo" />
-    <addaction name="separator" />
-    <addaction name="actionViewViewAll" />
+    <addaction name="actionViewPerspective"/>
+    <addaction name="actionViewCenter"/>
+    <addaction name="actionViewFront"/>
+    <addaction name="actionViewTop"/>
+    <addaction name="actionViewSide"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewAxis"/>
+    <addaction name="actionViewGrid"/>
+    <addaction name="actionViewInfo"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewViewAll"/>
    </widget>
-   <widget class="QMenu" name="menuWindow" >
-    <property name="title" >
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
      <string>&amp;Window</string>
     </property>
-    <addaction name="actionWindowSceneViewer" />
-    <addaction name="separator" />
-    <addaction name="actionWindowSceneDialog" />
-    <addaction name="actionWindowScreenDialog" />
-    <addaction name="actionWindowChannelManager" />
+    <addaction name="actionWindowSceneViewer"/>
+    <addaction name="separator"/>
+    <addaction name="actionWindowSceneDialog"/>
+    <addaction name="actionWindowScreenDialog"/>
+    <addaction name="actionWindowChannelManager"/>
    </widget>
-   <widget class="QMenu" name="menuFile" >
-    <property name="title" >
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
      <string>&amp;File</string>
     </property>
-    <addaction name="actionFileNew" />
-    <addaction name="actionFileOpen" />
-    <addaction name="actionFileSave" />
-    <addaction name="actionFileSaveAs" />
-    <addaction name="separator" />
-    <addaction name="actionFileExportDataset" />
-    <addaction name="separator" />
-    <addaction name="actionFileSyncClients" />
+    <addaction name="actionFileNew"/>
+    <addaction name="actionFileOpen"/>
+    <addaction name="actionFileSave"/>
+    <addaction name="actionFileSaveAs"/>
+    <addaction name="separator"/>
+    <addaction name="actionFileExportDataset"/>
+    <addaction name="separator"/>
+    <addaction name="actionFileSyncClients"/>
    </widget>
-   <widget class="QMenu" name="menuHelp" >
-    <property name="title" >
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
      <string>&amp;Help</string>
     </property>
-    <addaction name="actionHelpHelp" />
-    <addaction name="actionHelpPlugins" />
-    <addaction name="separator" />
-    <addaction name="actionHelpAbout" />
-    <addaction name="actionHelpAbout_Qt" />
+    <addaction name="actionHelpHelp"/>
+    <addaction name="actionHelpPlugins"/>
+    <addaction name="separator"/>
+    <addaction name="actionHelpAbout"/>
+    <addaction name="actionHelpAbout_Qt"/>
    </widget>
-   <addaction name="menuFile" />
-   <addaction name="menuEdit" />
-   <addaction name="menuView" />
-   <addaction name="menuWindow" />
-   <addaction name="menuHelp" />
+   <addaction name="menuFile"/>
+   <addaction name="menuEdit"/>
+   <addaction name="menuView"/>
+   <addaction name="menuWindow"/>
+   <addaction name="menuHelp"/>
   </widget>
-  <action name="actionFileNew" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileNew">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/new.png</normaloff>:/new/prefix1/Resources/new.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;New Project</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+N</string>
    </property>
   </action>
-  <action name="actionFileOpen" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileOpen">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/open.png</normaloff>:/new/prefix1/Resources/open.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Open Project...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+O</string>
    </property>
   </action>
-  <action name="actionFileSave" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileSave">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/save.png</normaloff>:/new/prefix1/Resources/save.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Save Project</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+S</string>
    </property>
   </action>
-  <action name="actionFileSaveAs" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileSaveAs">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/saveAs.png</normaloff>:/new/prefix1/Resources/saveAs.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Save Project &amp;As...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+A</string>
    </property>
   </action>
-  <action name="actionFileSyncClients" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileSyncClients">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/sync.png</normaloff>:/new/prefix1/Resources/sync.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Sync Clients</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Y</string>
    </property>
   </action>
-  <action name="actionFileExit" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileExit">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/exit.png</normaloff>:/new/prefix1/Resources/exit.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Exit</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="actionFileExitAll" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileExitAll">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/exitAll.png</normaloff>:/new/prefix1/Resources/exitAll.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Exit All</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+W</string>
    </property>
   </action>
-  <action name="actionEditDesignDistortionMap" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionEditDesignDistortionMap">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/distortionMode.png</normaloff>:/new/prefix1/Resources/distortionMode.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Distortion Map</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Alt+D</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionEditDesignBlendMap" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionEditDesignBlendMap">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/blendMode.png</normaloff>:/new/prefix1/Resources/blendMode.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Blend Map</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Alt+B</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionEditPreference" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionEditPreference">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/settings.png</normaloff>:/new/prefix1/Resources/settings.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Preferences</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Preferences</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Preferences</string>
    </property>
-   <property name="statusTip" >
+   <property name="statusTip">
     <string>Opens the preferences dialog</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Alt+P</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionViewPerspective" >
-   <property name="text" >
+  <action name="actionViewPerspective">
+   <property name="text">
     <string>&amp;Perspective</string>
    </property>
   </action>
-  <action name="actionViewCenter" >
-   <property name="text" >
+  <action name="actionViewCenter">
+   <property name="text">
     <string>&amp;Center</string>
    </property>
   </action>
-  <action name="actionViewTop" >
-   <property name="text" >
+  <action name="actionViewTop">
+   <property name="text">
     <string>Top</string>
    </property>
   </action>
-  <action name="actionViewSide" >
-   <property name="text" >
+  <action name="actionViewSide">
+   <property name="text">
     <string>Side</string>
    </property>
   </action>
-  <action name="actionViewFront" >
-   <property name="text" >
+  <action name="actionViewFront">
+   <property name="text">
     <string>Front</string>
    </property>
   </action>
-  <action name="actionViewAxis" >
-   <property name="text" >
+  <action name="actionViewAxis">
+   <property name="text">
     <string>&amp;Axis</string>
    </property>
   </action>
-  <action name="actionViewGrid" >
-   <property name="text" >
+  <action name="actionViewGrid">
+   <property name="text">
     <string>&amp;Grid</string>
    </property>
   </action>
-  <action name="actionViewInfo" >
-   <property name="text" >
+  <action name="actionViewInfo">
+   <property name="text">
     <string>&amp;Info</string>
    </property>
   </action>
-  <action name="actionViewViewAll" >
-   <property name="text" >
+  <action name="actionViewViewAll">
+   <property name="text">
     <string>View All</string>
    </property>
   </action>
-  <action name="actionWindowSceneViewer" >
-   <property name="text" >
+  <action name="actionWindowSceneViewer">
+   <property name="text">
     <string>Scene Viewer</string>
    </property>
   </action>
-  <action name="actionWindowSceneDialog" >
-   <property name="text" >
+  <action name="actionWindowSceneDialog">
+   <property name="text">
     <string>Scene</string>
    </property>
   </action>
-  <action name="actionWindowScreenDialog" >
-   <property name="text" >
+  <action name="actionWindowScreenDialog">
+   <property name="text">
     <string>Screen</string>
    </property>
   </action>
-  <action name="actionWindowChannelManager" >
-   <property name="text" >
+  <action name="actionWindowChannelManager">
+   <property name="text">
     <string>Channels</string>
    </property>
   </action>
-  <action name="actionHelpHelp" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpHelp">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/help.png</normaloff>:/new/prefix1/Resources/help.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Help...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>F1</string>
    </property>
   </action>
-  <action name="actionHelpAbout" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpAbout">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/projDesigner.png</normaloff>:/new/prefix1/Resources/projDesigner.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>About Projection Designer</string>
    </property>
   </action>
-  <action name="actionFileExportDataset" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileExportDataset">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/export.png</normaloff>:/new/prefix1/Resources/export.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Export Data set</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+E</string>
    </property>
   </action>
-  <action name="actionHelpPlugins" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpPlugins">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/plugins.png</normaloff>:/new/prefix1/Resources/plugins.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Plugins...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Alt+P</string>
    </property>
   </action>
-  <action name="actionHelpAbout_Qt" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpAbout_Qt">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/aboutQt.png</normaloff>:/new/prefix1/Resources/aboutQt.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>About Qt</string>
    </property>
@@ -394,5 +395,5 @@
  </customwidgets>
  <resources>
-  <include location="../../projdesigner.qrc" />
+  <include location="../../projdesigner.qrc"/>
  </resources>
  <connections/>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpanelwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpanelwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpanelwidget.ui	(revision 42)
@@ -1,9 +1,7 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QPanelWidget</class>
- <widget class="QWidget" name="QPanelWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QPanelWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,38 +11,38 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Designer</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="channelsTab" >
-      <attribute name="title" >
+    <widget class="QTabWidget" name="tabWidget">
+     <widget class="QWidget" name="channelsTab">
+      <attribute name="title">
        <string>Channels</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>4</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
           <number>0</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
          <item>
-          <widget class="projection::QChannelManagerWidget" name="channelManager" >
-           <property name="maximumSize" >
+          <widget class="projection::QChannelManagerWidget" name="channelManager" native="true">
+           <property name="maximumSize">
             <size>
              <width>16777215</width>
@@ -52,5 +50,5 @@
             </size>
            </property>
-           <property name="focusPolicy" >
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -58,26 +56,24 @@
          </item>
          <item>
-          <widget class="QGroupBox" name="channelGroup" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>5</hsizetype>
-             <vsizetype>5</vsizetype>
+          <widget class="QGroupBox" name="channelGroup">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="title" >
+           <property name="title">
             <string>Channel</string>
            </property>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
              <number>4</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
             <item>
-             <widget class="projection::QChannelWidget" name="channel" >
-              <property name="focusPolicy" >
+             <widget class="projection::QChannelWidget" name="channel" native="true">
+              <property name="focusPolicy">
                <enum>Qt::StrongFocus</enum>
               </property>
@@ -89,8 +85,8 @@
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -104,24 +100,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="screenTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="screenTab">
+      <attribute name="title">
        <string>Screen</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QScreenWidget" name="screen" />
+        <widget class="projection::QScreenWidget" name="screen" native="true"/>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -133,24 +129,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="sceneTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="sceneTab">
+      <attribute name="title">
        <string>Scene</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QSceneWidget" name="scene" />
+        <widget class="projection::QSceneWidget" name="scene" native="true"/>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -166,5 +162,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
@@ -172,6 +167,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelManagerWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -179,6 +172,4 @@
    <extends>QWidget</extends>
    <header>gui/QScreenWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -186,6 +177,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -193,6 +182,4 @@
    <extends>QWidget</extends>
    <header>gui/QSceneWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpreferencedialog.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpreferencedialog.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpreferencedialog.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QPreferenceDialog</class>
- <widget class="QDialog" name="QPreferenceDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="QPreferenceDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,49 +11,49 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Preference</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../../projdesigner.qrc" >
+  <property name="windowIcon">
+   <iconset resource="../../projdesigner.qrc">
     <normaloff>:/new/prefix1/Resources/settings.png</normaloff>:/new/prefix1/Resources/settings.png</iconset>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="spacing" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>4</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="spacing" >
+    <layout class="QVBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QGroupBox" name="gridGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="gridGroupBox">
+       <property name="title">
         <string>Grid</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QLabel" name="gridSizeLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="gridSizeLabel">
+            <property name="text">
              <string>Size</string>
             </property>
@@ -60,6 +61,6 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="gridSizeEdit" >
-            <property name="minimumSize" >
+           <widget class="QLineEdit" name="gridSizeEdit">
+            <property name="minimumSize">
              <size>
               <width>64</width>
@@ -67,5 +68,5 @@
              </size>
             </property>
-            <property name="maximumSize" >
+            <property name="maximumSize">
              <size>
               <width>64</width>
@@ -76,6 +77,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="gridSubdivLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="gridSubdivLabel">
+            <property name="text">
              <string>Subdivision</string>
             </property>
@@ -83,12 +84,12 @@
           </item>
           <item>
-           <widget class="QSpinBox" name="gridSubdivSpinBox" />
+           <widget class="QSpinBox" name="gridSubdivSpinBox"/>
           </item>
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
@@ -104,34 +105,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="offscreenSceneRenderingGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="offscreenSceneRenderingGroupBox">
+       <property name="title">
         <string>Off-screen Scene Rendering</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="bufferSizeLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="bufferSizeLabel">
+              <property name="text">
                <string>Buffer size</string>
               </property>
@@ -139,32 +140,32 @@
             </item>
             <item>
-             <widget class="QComboBox" name="bufferWidthComboBox" >
-              <item>
-               <property name="text" >
+             <widget class="QComboBox" name="bufferWidthComboBox">
+              <item>
+               <property name="text">
                 <string>128</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>4096</string>
                </property>
@@ -173,32 +174,32 @@
             </item>
             <item>
-             <widget class="QComboBox" name="bufferHeightComboBox" >
-              <item>
-               <property name="text" >
+             <widget class="QComboBox" name="bufferHeightComboBox">
+              <item>
+               <property name="text">
                 <string>128</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>4096</string>
                </property>
@@ -208,8 +209,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -227,34 +228,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="blendMapGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="blendMapGroupBox">
+       <property name="title">
         <string>Blend Map</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QCheckBox" name="softEdgeCheckBox" >
-              <property name="text" >
+             <widget class="QCheckBox" name="softEdgeCheckBox">
+              <property name="text">
                <string>Soft edge</string>
               </property>
@@ -262,12 +263,12 @@
             </item>
             <item>
-             <widget class="QLabel" name="blendEdgeWidthLabel" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+             <widget class="QLabel" name="blendEdgeWidthLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="text" >
+              <property name="text">
                <string> Width</string>
               </property>
@@ -275,9 +276,9 @@
             </item>
             <item>
-             <widget class="QSpinBox" name="blendEdgeWidthSpinBox" />
-            </item>
-            <item>
-             <widget class="QLabel" name="blendEdgeExponentLabel" >
-              <property name="text" >
+             <widget class="QSpinBox" name="blendEdgeWidthSpinBox"/>
+            </item>
+            <item>
+             <widget class="QLabel" name="blendEdgeExponentLabel">
+              <property name="text">
                <string>Exponent</string>
               </property>
@@ -285,6 +286,6 @@
             </item>
             <item>
-             <widget class="QLineEdit" name="blendEdgeExponentEdit" >
-              <property name="maximumSize" >
+             <widget class="QLineEdit" name="blendEdgeExponentEdit">
+              <property name="maximumSize">
                <size>
                 <width>32</width>
@@ -296,8 +297,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
@@ -315,34 +316,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="exportGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="exportGroupBox">
+       <property name="title">
         <string>Export</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="exportSizeLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="exportSizeLabel">
+              <property name="text">
                <string>Image size</string>
               </property>
@@ -350,25 +351,25 @@
             </item>
             <item>
-             <widget class="QComboBox" name="exportWidthComboBox" >
-              <property name="editable" >
+             <widget class="QComboBox" name="exportWidthComboBox">
+              <property name="editable">
                <bool>true</bool>
               </property>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
@@ -377,25 +378,25 @@
             </item>
             <item>
-             <widget class="QComboBox" name="exportHeightComboBox" >
-              <property name="editable" >
+             <widget class="QComboBox" name="exportHeightComboBox">
+              <property name="editable">
                <bool>true</bool>
               </property>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
@@ -405,8 +406,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -419,6 +420,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="exportFileNamePatternLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="exportFileNamePatternLabel">
+            <property name="text">
              <string>Export file name pattern</string>
             </property>
@@ -426,20 +427,20 @@
           </item>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeType" >
+              <property name="sizeType">
                <enum>QSizePolicy::Fixed</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>10</width>
@@ -450,28 +451,28 @@
             </item>
             <item>
-             <layout class="QGridLayout" >
-              <property name="margin" >
+             <layout class="QGridLayout">
+              <property name="margin">
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="spacing">
                <number>6</number>
               </property>
-              <item row="0" column="0" >
-               <widget class="QLabel" name="exportDistortMapPatternLabel" >
-                <property name="text" >
+              <item row="0" column="0">
+               <widget class="QLabel" name="exportDistortMapPatternLabel">
+                <property name="text">
                  <string>Distortion map file</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0" >
-               <widget class="QLabel" name="exportViewMatrixPatternLabel" >
-                <property name="text" >
+              <item row="2" column="0">
+               <widget class="QLabel" name="exportViewMatrixPatternLabel">
+                <property name="text">
                  <string>View matrix file</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" >
-               <widget class="QLineEdit" name="exportDistortMapPatternEdit" >
-                <property name="minimumSize" >
+              <item row="0" column="1">
+               <widget class="QLineEdit" name="exportDistortMapPatternEdit">
+                <property name="minimumSize">
                  <size>
                   <width>180</width>
@@ -481,13 +482,13 @@
                </widget>
               </item>
-              <item row="2" column="1" >
-               <widget class="QLineEdit" name="exportViewMatrixPatternEdit" />
-              </item>
-              <item row="1" column="1" >
-               <widget class="QLineEdit" name="exportBlendMapPatternEdit" />
-              </item>
-              <item row="1" column="0" >
-               <widget class="QLabel" name="exportBlendMapPatternLabel" >
-                <property name="text" >
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="exportViewMatrixPatternEdit"/>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="exportBlendMapPatternEdit"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="exportBlendMapPatternLabel">
+                <property name="text">
                  <string>Blend map file</string>
                 </property>
@@ -498,8 +499,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -518,8 +519,8 @@
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>325</width>
@@ -530,6 +531,6 @@
      </item>
      <item>
-      <widget class="QPushButton" name="pB_ClosePrefDiag" >
-       <property name="text" >
+      <widget class="QPushButton" name="pB_ClosePrefDiag">
+       <property name="text">
         <string>Close</string>
        </property>
@@ -541,5 +542,5 @@
  </widget>
  <resources>
-  <include location="../../projdesigner.qrc" />
+  <include location="../../projdesigner.qrc"/>
  </resources>
  <connections>
@@ -550,9 +551,9 @@
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>172</x>
      <y>345</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>172</x>
      <y>181</y>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qprojectionmatrixwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qprojectionmatrixwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qprojectionmatrixwidget.ui	(revision 42)
@@ -1,57 +1,55 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QProjectionMatrixWidget</class>
- <widget class="QWidget" name="QProjectionMatrixWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QProjectionMatrixWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>169</width>
+    <width>190</width>
     <height>110</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Projection</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="fovLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="fovLabel">
+            <property name="text">
              <string>FOV</string>
             </property>
@@ -59,9 +57,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="fovEdit" />
+           <widget class="QLineEdit" name="fovEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="aspectLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="aspectLabel">
+            <property name="text">
              <string>Aspect</string>
             </property>
@@ -69,19 +67,19 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="aspectRatioEdit" />
+           <widget class="QLineEdit" name="aspectRatioEdit"/>
           </item>
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="nearLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="nearLabel">
+            <property name="text">
              <string>Near</string>
             </property>
@@ -89,9 +87,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="nearEdit" />
+           <widget class="QLineEdit" name="nearEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="farLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="farLabel">
+            <property name="text">
              <string>Far</string>
             </property>
@@ -99,19 +97,19 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="farEdit" />
+           <widget class="QLineEdit" name="farEdit"/>
           </item>
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="offaxisLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisLabel">
+            <property name="text">
              <string>Off-axis </string>
             </property>
@@ -119,6 +117,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="offaxisXLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisXLabel">
+            <property name="text">
              <string>X</string>
             </property>
@@ -126,9 +124,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="offaxisXEdit" />
+           <widget class="QLineEdit" name="offaxisXEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="offaxisYLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisYLabel">
+            <property name="text">
              <string>Y</string>
             </property>
@@ -136,5 +134,5 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="offaxisYEdit" />
+           <widget class="QLineEdit" name="offaxisYEdit"/>
           </item>
          </layout>
@@ -147,5 +145,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>fovEdit</tabstop>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscenewidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscenewidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscenewidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QSceneWidget</class>
- <widget class="QWidget" name="QSceneWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QSceneWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,25 +11,25 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Scene Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>4</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="projection::QTransformMatrixWidget" native="1" name="transformWidget" >
-       <property name="focusPolicy" >
+     <item>
+      <widget class="projection::QTransformMatrixWidget" name="transformWidget" native="true">
+       <property name="focusPolicy">
         <enum>Qt::StrongFocus</enum>
        </property>
@@ -36,34 +37,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="contentGroup" >
-       <property name="title" >
+      <widget class="QGroupBox" name="contentGroup">
+       <property name="title">
         <string>Content</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
              <number>0</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
             <item>
-             <widget class="QLabel" name="typeLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="typeLabel">
+              <property name="text">
                <string>Type</string>
               </property>
@@ -71,6 +72,6 @@
             </item>
             <item>
-             <widget class="QComboBox" name="typeComboBox" >
-              <property name="minimumSize" >
+             <widget class="QComboBox" name="typeComboBox">
+              <property name="minimumSize">
                <size>
                 <width>96</width>
@@ -82,8 +83,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -96,9 +97,9 @@
           </item>
           <item>
-           <widget class="QStackedWidget" name="stackedWidget" >
-            <property name="focusPolicy" >
+           <widget class="QStackedWidget" name="stackedWidget">
+            <property name="focusPolicy">
              <enum>Qt::StrongFocus</enum>
             </property>
-            <property name="currentIndex" >
+            <property name="currentIndex">
              <number>-1</number>
             </property>
@@ -111,6 +112,6 @@
      </item>
      <item>
-      <widget class="QCheckBox" name="showInDesignViewCheckBox" >
-       <property name="text" >
+      <widget class="QCheckBox" name="showInDesignViewCheckBox">
+       <property name="text">
         <string>Show in Design View</string>
        </property>
@@ -118,14 +119,14 @@
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="sceneSizeLabel" >
-         <property name="text" >
+       <item>
+        <widget class="QLabel" name="sceneSizeLabel">
+         <property name="text">
           <string>Scene size</string>
          </property>
@@ -133,6 +134,6 @@
        </item>
        <item>
-        <widget class="QLineEdit" name="sceneSizeEdit" >
-         <property name="maximumSize" >
+        <widget class="QLineEdit" name="sceneSizeEdit">
+         <property name="maximumSize">
           <size>
            <width>64</width>
@@ -144,8 +145,8 @@
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
@@ -158,14 +159,14 @@
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QCheckBox" name="gridCheckBox" >
-         <property name="text" >
+       <item>
+        <widget class="QCheckBox" name="gridCheckBox">
+         <property name="text">
           <string>Grid</string>
          </property>
@@ -173,6 +174,6 @@
        </item>
        <item>
-        <widget class="QLabel" name="gridSizeLabel" >
-         <property name="text" >
+        <widget class="QLabel" name="gridSizeLabel">
+         <property name="text">
           <string>Size</string>
          </property>
@@ -180,6 +181,6 @@
        </item>
        <item>
-        <widget class="QLineEdit" name="gridSizeEdit" >
-         <property name="maximumSize" >
+        <widget class="QLineEdit" name="gridSizeEdit">
+         <property name="maximumSize">
           <size>
            <width>64</width>
@@ -191,8 +192,8 @@
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
@@ -205,17 +206,17 @@
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
@@ -226,6 +227,6 @@
        </item>
        <item>
-        <widget class="QPushButton" name="centerViewButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="centerViewButton">
+         <property name="text">
           <string>Center View</string>
          </property>
@@ -233,6 +234,6 @@
        </item>
        <item>
-        <widget class="QPushButton" name="viewAllButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="viewAllButton">
+         <property name="text">
           <string>ViewAll</string>
          </property>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscreenwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscreenwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscreenwidget.ui	(revision 42)
@@ -1,603 +1,598 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QScreenWidget</class>
- <widget class="QWidget" name="QScreenWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QScreenWidget">
+  <property name="geometry">
    <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>183</width>
-	<height>222</height>
+    <x>0</x>
+    <y>0</y>
+    <width>197</width>
+    <height>242</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Screen Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
-	<number>4</number>
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
    </property>
-   <property name="spacing" >
-	<number>6</number>
+   <property name="margin">
+    <number>4</number>
    </property>
    <item>
-	<layout class="QVBoxLayout" >
-	 <property name="margin" >
-	  <number>0</number>
-	 </property>
-	 <property name="spacing" >
-	  <number>6</number>
-	 </property>
-	 <item>
-	  <widget class="projection::QTransformMatrixWidget" name="transformWidget" >
-	   <property name="focusPolicy" >
-		<enum>Qt::StrongFocus</enum>
-	   </property>
-	  </widget>
-	 </item>
-	 <item>
-	  <widget class="QGroupBox" name="shapeGroup" >
-	   <property name="title" >
-		<string>Shape</string>
-	   </property>
-	   <layout class="QHBoxLayout" >
-		<property name="margin" >
-		 <number>4</number>
-		</property>
-		<property name="spacing" >
-		 <number>6</number>
-		</property>
-		<item>
-		 <layout class="QVBoxLayout" >
-		  <property name="margin" >
-		   <number>0</number>
-		  </property>
-		  <property name="spacing" >
-		   <number>6</number>
-		  </property>
-		  <item>
-		   <layout class="QHBoxLayout" >
-			<property name="margin" >
-			 <number>0</number>
-			</property>
-			<property name="spacing" >
-			 <number>6</number>
-			</property>
-			<item>
-			 <widget class="QLabel" name="typeLabel" >
-			  <property name="text" >
-			   <string>Type</string>
-			  </property>
-			 </widget>
-			</item>
-			<item>
-			 <widget class="QComboBox" name="typeComboBox" >
-			  <property name="minimumSize" >
-			   <size>
-				<width>96</width>
-				<height>0</height>
-			   </size>
-			  </property>
-			  <item>
-			   <property name="text" >
-				<string>Dome</string>
-			   </property>
-			  </item>
-			  <item>
-			   <property name="text" >
-				<string>Plane</string>
-			   </property>
-			  </item>
-			  <item>
-			   <property name="text" >
-				<string>Box</string>
-			   </property>
-			  </item>
-			 </widget>
-			</item>
-			<item>
-			 <spacer>
-			  <property name="orientation" >
-			   <enum>Qt::Horizontal</enum>
-			  </property>
-			  <property name="sizeHint" >
-			   <size>
-				<width>40</width>
-				<height>20</height>
-			   </size>
-			  </property>
-			 </spacer>
-			</item>
-		   </layout>
-		  </item>
-		  <item>
-		   <widget class="QStackedWidget" name="stackedWidget" >
-			<property name="currentIndex" >
-			 <number>0</number>
-			</property>
-			<widget class="QWidget" name="domePage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeRadiusLabel" >
-					<property name="text" >
-					 <string>Radius</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QLineEdit" name="domeRadiusEdit" />
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeAzimResLabel" >
-					<property name="text" >
-					 <string>Azimuth Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QSpinBox" name="domeAzimResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>2</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeElevResLabel" >
-					<property name="text" >
-					 <string>Elevation Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QSpinBox" name="domeElevResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>2</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeSubdivLabel" >
-					<property name="text" >
-					 <string>Subdivision</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QSpinBox" name="domeSubdivSpinBox" >
-					<property name="maximum" >
-					 <number>8</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <widget class="QCheckBox" name="domeFullDomeCheckBox" >
-				  <property name="text" >
-				   <string>Full dome</string>
-				  </property>
-				 </widget>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-			<widget class="QWidget" name="planePage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QGridLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item row="1" column="0" >
-				   <widget class="QLabel" name="planeHeightLabel" >
-					<property name="text" >
-					 <string>Height</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="2" >
-				   <widget class="QLabel" name="planeHorResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="3" >
-				   <widget class="QSpinBox" name="planeHorResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="2" >
-				   <widget class="QLabel" name="planeVertResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="1" >
-				   <widget class="QLineEdit" name="planeWidthEdit" />
-				  </item>
-				  <item row="0" column="0" >
-				   <widget class="QLabel" name="planeWidthLabel" >
-					<property name="text" >
-					 <string>Width</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="1" >
-				   <widget class="QLineEdit" name="planeHeightEdit" />
-				  </item>
-				  <item row="1" column="3" >
-				   <widget class="QSpinBox" name="planeVertResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-			<widget class="QWidget" name="boxPage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QGridLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item row="1" column="3" >
-				   <widget class="QSpinBox" name="boxVertResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="2" >
-				   <widget class="QLabel" name="boxHorResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="2" column="2" >
-				   <widget class="QLabel" name="boxDepthResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="0" >
-				   <widget class="QLabel" name="boxHeightLabel" >
-					<property name="text" >
-					 <string>Height</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="0" >
-				   <widget class="QLabel" name="boxWidthLabel" >
-					<property name="text" >
-					 <string>Width</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="1" >
-				   <widget class="QLineEdit" name="boxWidthEdit" />
-				  </item>
-				  <item row="0" column="3" >
-				   <widget class="QSpinBox" name="boxHorResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="2" column="3" >
-				   <widget class="QSpinBox" name="boxDepthResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="2" >
-				   <widget class="QLabel" name="boxVertResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="2" column="1" >
-				   <widget class="QLineEdit" name="boxDepthEdit" />
-				  </item>
-				  <item row="2" column="0" >
-				   <widget class="QLabel" name="boxDepthLabel" >
-					<property name="text" >
-					 <string>Depth</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="1" >
-				   <widget class="QLineEdit" name="boxHeightEdit" />
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-			<widget class="QWidget" name="modelPage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="modelFileNameLabel" >
-					<property name="text" >
-					 <string>File</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QLineEdit" name="modelFileNameEdit" />
-				  </item>
-				  <item>
-				   <widget class="QPushButton" name="modelBrowseButton" >
-					<property name="sizePolicy" >
-					 <sizepolicy>
-					  <hsizetype>0</hsizetype>
-					  <vsizetype>0</vsizetype>
-					  <horstretch>0</horstretch>
-					  <verstretch>0</verstretch>
-					 </sizepolicy>
-					</property>
-					<property name="maximumSize" >
-					 <size>
-					  <width>23</width>
-					  <height>16777215</height>
-					 </size>
-					</property>
-					<property name="text" >
-					 <string>...</string>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-		   </widget>
-		  </item>
-		 </layout>
-		</item>
-	   </layout>
-	  </widget>
-	 </item>
-	 <item>
-	  <layout class="QHBoxLayout" >
-	   <property name="margin" >
-		<number>0</number>
-	   </property>
-	   <property name="spacing" >
-		<number>6</number>
-	   </property>
-	   <item>
-		<widget class="QCheckBox" name="frameCheckBox" >
-		 <property name="text" >
-		  <string>Wireframe</string>
-		 </property>
-		</widget>
-	   </item>
-	   <item>
-		<widget class="QLabel" name="frameLineWidthLabel" >
-		 <property name="text" >
-		  <string>Width</string>
-		 </property>
-		</widget>
-	   </item>
-	   <item>
-		<widget class="QSpinBox" name="frameLineWidthSpinBox" >
-		 <property name="maximum" >
-		  <number>4</number>
-		 </property>
-		 <property name="minimum" >
-		  <number>1</number>
-		 </property>
-		</widget>
-	   </item>
-	  </layout>
-	 </item>
-	</layout>
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="projection::QTransformMatrixWidget" name="transformWidget" native="true">
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="shapeGroup">
+       <property name="title">
+        <string>Shape</string>
+       </property>
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
+         <number>4</number>
+        </property>
+        <item>
+         <layout class="QVBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="typeLabel">
+              <property name="text">
+               <string>Type</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="typeComboBox">
+              <property name="minimumSize">
+               <size>
+                <width>96</width>
+                <height>0</height>
+               </size>
+              </property>
+              <item>
+               <property name="text">
+                <string>Dome</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Plane</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Box</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QStackedWidget" name="stackedWidget">
+            <property name="currentIndex">
+             <number>0</number>
+            </property>
+            <widget class="QWidget" name="domePage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeRadiusLabel">
+                    <property name="text">
+                     <string>Radius</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLineEdit" name="domeRadiusEdit"/>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeAzimResLabel">
+                    <property name="text">
+                     <string>Azimuth Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="domeAzimResSpinBox">
+                    <property name="minimum">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeElevResLabel">
+                    <property name="text">
+                     <string>Elevation Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="domeElevResSpinBox">
+                    <property name="minimum">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeSubdivLabel">
+                    <property name="text">
+                     <string>Subdivision</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="domeSubdivSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>8</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="domeFullDomeCheckBox">
+                  <property name="text">
+                   <string>Full dome</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="planePage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QGridLayout">
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="planeHeightLabel">
+                    <property name="text">
+                     <string>Height</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QLabel" name="planeHorResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="3">
+                   <widget class="QSpinBox" name="planeHorResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="planeVertResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="planeWidthEdit"/>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="planeWidthLabel">
+                    <property name="text">
+                     <string>Width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QLineEdit" name="planeHeightEdit"/>
+                  </item>
+                  <item row="1" column="3">
+                   <widget class="QSpinBox" name="planeVertResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="boxPage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QGridLayout">
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <item row="1" column="3">
+                   <widget class="QSpinBox" name="boxVertResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QLabel" name="boxHorResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="2">
+                   <widget class="QLabel" name="boxDepthResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="boxHeightLabel">
+                    <property name="text">
+                     <string>Height</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="boxWidthLabel">
+                    <property name="text">
+                     <string>Width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="boxWidthEdit"/>
+                  </item>
+                  <item row="0" column="3">
+                   <widget class="QSpinBox" name="boxHorResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="3">
+                   <widget class="QSpinBox" name="boxDepthResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="boxVertResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="1">
+                   <widget class="QLineEdit" name="boxDepthEdit"/>
+                  </item>
+                  <item row="2" column="0">
+                   <widget class="QLabel" name="boxDepthLabel">
+                    <property name="text">
+                     <string>Depth</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QLineEdit" name="boxHeightEdit"/>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="modelPage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="modelFileNameLabel">
+                    <property name="text">
+                     <string>File</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLineEdit" name="modelFileNameEdit"/>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="modelBrowseButton">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>23</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QCheckBox" name="frameCheckBox">
+         <property name="text">
+          <string>Wireframe</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="frameLineWidthLabel">
+         <property name="text">
+          <string>Width</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="frameLineWidthSpinBox">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>4</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
@@ -605,6 +600,4 @@
    <extends>QWidget</extends>
    <header>gui/QTransformMatrixWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qsetupdialog.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qsetupdialog.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qsetupdialog.ui	(revision 42)
@@ -1,9 +1,7 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QSetupDialog</class>
- <widget class="QWidget" name="QSetupDialog" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QSetupDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,38 +11,38 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Multichannel Projection Designer</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="channelsTab" >
-      <attribute name="title" >
+    <widget class="QTabWidget" name="tabWidget">
+     <widget class="QWidget" name="channelsTab">
+      <attribute name="title">
        <string>Channels</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>4</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
           <number>0</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
          <item>
-          <widget class="projection::QChannelManagerWidget" name="channelManager" >
-           <property name="maximumSize" >
+          <widget class="projection::QChannelManagerWidget" name="channelManager" native="true">
+           <property name="maximumSize">
             <size>
              <width>16777215</width>
@@ -52,5 +50,5 @@
             </size>
            </property>
-           <property name="focusPolicy" >
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -58,26 +56,24 @@
          </item>
          <item>
-          <widget class="QGroupBox" name="channelGroup" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>5</hsizetype>
-             <vsizetype>5</vsizetype>
+          <widget class="QGroupBox" name="channelGroup">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>1</verstretch>
             </sizepolicy>
            </property>
-           <property name="title" >
+           <property name="title">
             <string>Channel</string>
            </property>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
              <number>4</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
             <item>
-             <widget class="projection::QChannelWidget" name="channel" >
-              <property name="focusPolicy" >
+             <widget class="projection::QChannelWidget" name="channel" native="true">
+              <property name="focusPolicy">
                <enum>Qt::StrongFocus</enum>
               </property>
@@ -89,8 +85,8 @@
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -104,24 +100,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="screenTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="screenTab">
+      <attribute name="title">
        <string>Screen</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QScreenWidget" name="screen" />
+        <widget class="projection::QScreenWidget" name="screen" native="true"/>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -133,24 +129,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="sceneTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="sceneTab">
+      <attribute name="title">
        <string>Scene</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QSceneWidget" name="scene" />
+        <widget class="projection::QSceneWidget" name="scene" native="true"/>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -166,5 +162,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
@@ -172,6 +167,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelManagerWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -179,6 +172,4 @@
    <extends>QWidget</extends>
    <header>gui/QScreenWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -186,6 +177,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -193,6 +182,4 @@
    <extends>QWidget</extends>
    <header>gui/QSceneWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qtransformmatrixwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qtransformmatrixwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qtransformmatrixwidget.ui	(revision 42)
@@ -1,93 +1,91 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QTransformMatrixWidget</class>
- <widget class="QWidget" name="QTransformMatrixWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QTransformMatrixWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>179</width>
-    <height>78</height>
+    <width>203</width>
+    <height>95</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Matrix Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QGroupBox" name="transformGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="transformGroup">
+     <property name="title">
       <string>Transform</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <layout class="QGridLayout" >
-        <property name="margin" >
+       <layout class="QGridLayout">
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>6</number>
         </property>
-        <item row="0" column="3" >
-         <widget class="QLineEdit" name="posZEdit" />
+        <item row="0" column="3">
+         <widget class="QLineEdit" name="posZEdit"/>
         </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="rotHEdit" />
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="rotHEdit"/>
         </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="posLabel" >
-          <property name="text" >
+        <item row="0" column="0">
+         <widget class="QLabel" name="posLabel">
+          <property name="text">
            <string>Pos</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="rotLabel" >
-          <property name="text" >
+        <item row="1" column="0">
+         <widget class="QLabel" name="rotLabel">
+          <property name="text">
            <string>Rot</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="posXEdit" />
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="posXEdit"/>
         </item>
-        <item row="1" column="3" >
-         <widget class="QLineEdit" name="rotREdit" />
+        <item row="1" column="3">
+         <widget class="QLineEdit" name="rotREdit"/>
         </item>
-        <item row="1" column="2" >
-         <widget class="QLineEdit" name="rotPEdit" />
+        <item row="1" column="2">
+         <widget class="QLineEdit" name="rotPEdit"/>
         </item>
-        <item row="0" column="2" >
-         <widget class="QLineEdit" name="posYEdit" />
+        <item row="0" column="2">
+         <widget class="QLineEdit" name="posYEdit"/>
         </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="scaleLabel" >
-          <property name="text" >
+        <item row="2" column="0">
+         <widget class="QLabel" name="scaleLabel">
+          <property name="text">
            <string>Scale</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1" >
-         <widget class="QLineEdit" name="scaleXEdit" />
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="scaleXEdit"/>
         </item>
-        <item row="2" column="2" >
-         <widget class="QLineEdit" name="scaleYEdit" />
+        <item row="2" column="2">
+         <widget class="QLineEdit" name="scaleYEdit"/>
         </item>
-        <item row="2" column="3" >
-         <widget class="QLineEdit" name="scaleZEdit" />
+        <item row="2" column="3">
+         <widget class="QLineEdit" name="scaleZEdit"/>
         </item>
        </layout>
@@ -98,5 +96,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>posXEdit</tabstop>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/projdesigner.vcproj
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/projdesigner.vcproj	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/projdesigner.vcproj	(revision 42)
@@ -2,9 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="projdesigner"
 	ProjectGUID="{4418A7F1-9C0E-31B2-B8A2-913D1394330B}"
 	RootNamespace="projdesigner"
 	Keyword="Qt4VSv1.0"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -46,5 +47,5 @@
 				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="4"
-				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtNetwork&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include\QtOpenGL&quot;,&quot;$(QTDIR)\include\QtXml&quot;,&quot;$(QTDIR)\include&quot;,&quot;..&quot;,&quot;.&quot;,&quot;include&quot;,&quot;include\math&quot;,&quot;include\gui&quot;,&quot;include\screen&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;debug&quot;,&quot;.&quot;,$(QTDIR)\mkspecs\win32-msvc2005"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include\QtXml&quot;;&quot;$(QTDIR)\include&quot;;..;.;include;include\math;include\gui;include\screen;&quot;$(QTDIR)\include\ActiveQt&quot;;debug;&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot;;&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6&quot;"
 				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_XML_LIB,QT_OPENGL_LIB,QT_GUI_LIB,QT_NETWORK_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
 				GeneratePreprocessedFile="0"
@@ -76,11 +77,13 @@
 				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
 				AdditionalDependencies="opengl32.lib glu32.lib gdi32.lib user32.lib $(QTDIR)\lib\qtmaind.lib glut32.lib projdesigner_default.lib $(QTDIR)\lib\QtXmld4.lib $(QTDIR)\lib\QtOpenGLd4.lib $(QTDIR)\lib\QtGuid4.lib $(QTDIR)\lib\QtNetworkd4.lib $(QTDIR)\lib\QtCored4.lib"
-				OutputFile="..\bin\projdesigner.exe"
+				OutputFile="..\bin\projdesignerd.exe"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(QTDIR)\lib,../projdesignerplugins/defaultplugin"
+				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;../projdesignerplugins/defaultplugin;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\lib\x86"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=""
 				SubSystem="2"
 				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
@@ -101,7 +104,4 @@
 			<Tool
 				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
 			/>
 			<Tool
@@ -140,5 +140,5 @@
 				Optimization="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtNetwork&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include\QtOpenGL&quot;,&quot;$(QTDIR)\include\QtXml&quot;,&quot;$(QTDIR)\include&quot;,&quot;..&quot;,&quot;.&quot;,&quot;include&quot;,&quot;include\math&quot;,&quot;include\gui&quot;,&quot;include\screen&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;release&quot;,&quot;.&quot;,$(QTDIR)\mkspecs\win32-msvc2005"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include\QtXml&quot;;&quot;$(QTDIR)\include&quot;;..;.;include;include\math;include\gui;include\screen;&quot;$(QTDIR)\include\ActiveQt&quot;;debug;&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot;;&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6&quot;"
 				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_XML_LIB,QT_OPENGL_LIB,QT_GUI_LIB,QT_NETWORK_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
 				GeneratePreprocessedFile="0"
@@ -173,9 +173,11 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(QTDIR)\lib,../projdesignerplugins/defaultplugin"
+				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;../projdesignerplugins/defaultplugin;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\lib\x86"
 				GenerateDebugInformation="false"
 				ProgramDatabaseFile=""
 				SubSystem="2"
 				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
@@ -196,7 +198,4 @@
 			<Tool
 				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
 			/>
 			<Tool
@@ -364,5 +363,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Channel.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Channel.h -o debug\moc_Channel.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Channel.h&quot; -o &quot;debug\moc_Channel.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Channel.h"
 						Outputs="debug\moc_Channel.cpp"
@@ -375,5 +374,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Channel.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Channel.h -o release\moc_Channel.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Channel.h&quot; -o &quot;release\moc_Channel.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Channel.h"
 						Outputs="release\moc_Channel.cpp"
@@ -398,5 +397,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Frustum.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Frustum.h -o debug\moc_Frustum.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Frustum.h&quot; -o &quot;debug\moc_Frustum.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Frustum.h"
 						Outputs="debug\moc_Frustum.cpp"
@@ -409,5 +408,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Frustum.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Frustum.h -o release\moc_Frustum.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Frustum.h&quot; -o &quot;release\moc_Frustum.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Frustum.h"
 						Outputs="release\moc_Frustum.cpp"
@@ -428,5 +427,5 @@
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing interfaces.h..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;include\interfaces.h&quot; -o &quot;$(ConfigurationName)\moc_interfaces.cpp&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\interfaces.h&quot; -o &quot;$(ConfigurationName)\moc_interfaces.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;include\interfaces.h"
 						Outputs="&quot;$(ConfigurationName)\moc_interfaces.cpp&quot;"
@@ -439,5 +438,5 @@
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing interfaces.h..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;include\interfaces.h&quot; -o &quot;$(ConfigurationName)\moc_interfaces.cpp&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\interfaces.h&quot; -o &quot;$(ConfigurationName)\moc_interfaces.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;include\interfaces.h"
 						Outputs="&quot;$(ConfigurationName)\moc_interfaces.cpp&quot;"
@@ -454,5 +453,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\plugindialog.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\plugindialog.h -o debug\moc_plugindialog.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\plugindialog.h&quot; -o &quot;debug\moc_plugindialog.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\plugindialog.h"
 						Outputs="debug\moc_plugindialog.cpp"
@@ -465,5 +464,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\plugindialog.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\plugindialog.h -o release\moc_plugindialog.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\plugindialog.h&quot; -o &quot;release\moc_plugindialog.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\plugindialog.h"
 						Outputs="release\moc_plugindialog.cpp"
@@ -488,5 +487,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QChannelManagerWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QChannelManagerWidget.h -o debug\moc_QChannelManagerWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QChannelManagerWidget.h&quot; -o &quot;debug\moc_QChannelManagerWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QChannelManagerWidget.h"
 						Outputs="debug\moc_QChannelManagerWidget.cpp"
@@ -499,5 +498,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QChannelManagerWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QChannelManagerWidget.h -o release\moc_QChannelManagerWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QChannelManagerWidget.h&quot; -o &quot;release\moc_QChannelManagerWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QChannelManagerWidget.h"
 						Outputs="release\moc_QChannelManagerWidget.cpp"
@@ -514,5 +513,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QChannelWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QChannelWidget.h -o debug\moc_QChannelWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QChannelWidget.h&quot; -o &quot;debug\moc_QChannelWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QChannelWidget.h"
 						Outputs="debug\moc_QChannelWidget.cpp"
@@ -525,5 +524,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QChannelWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QChannelWidget.h -o release\moc_QChannelWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QChannelWidget.h&quot; -o &quot;release\moc_QChannelWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QChannelWidget.h"
 						Outputs="release\moc_QChannelWidget.cpp"
@@ -540,5 +539,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QClientWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QClientWindow.h -o debug\moc_QClientWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QClientWindow.h&quot; -o &quot;debug\moc_QClientWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QClientWindow.h"
 						Outputs="debug\moc_QClientWindow.cpp"
@@ -551,5 +550,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QClientWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QClientWindow.h -o release\moc_QClientWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QClientWindow.h&quot; -o &quot;release\moc_QClientWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QClientWindow.h"
 						Outputs="release\moc_QClientWindow.cpp"
@@ -566,5 +565,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QDesignViewWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QDesignViewWidget.h -o debug\moc_QDesignViewWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QDesignViewWidget.h&quot; -o &quot;debug\moc_QDesignViewWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QDesignViewWidget.h"
 						Outputs="debug\moc_QDesignViewWidget.cpp"
@@ -577,5 +576,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QDesignViewWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QDesignViewWidget.h -o release\moc_QDesignViewWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QDesignViewWidget.h&quot; -o &quot;release\moc_QDesignViewWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QDesignViewWidget.h"
 						Outputs="release\moc_QDesignViewWidget.cpp"
@@ -592,5 +591,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QDesignViewWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QDesignViewWindow.h -o debug\moc_QDesignViewWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QDesignViewWindow.h&quot; -o &quot;debug\moc_QDesignViewWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QDesignViewWindow.h"
 						Outputs="debug\moc_QDesignViewWindow.cpp"
@@ -603,5 +602,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QDesignViewWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QDesignViewWindow.h -o release\moc_QDesignViewWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QDesignViewWindow.h&quot; -o &quot;release\moc_QDesignViewWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QDesignViewWindow.h"
 						Outputs="release\moc_QDesignViewWindow.cpp"
@@ -618,5 +617,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QGLViewerWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QGLViewerWidget.h -o debug\moc_QGLViewerWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QGLViewerWidget.h&quot; -o &quot;debug\moc_QGLViewerWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QGLViewerWidget.h"
 						Outputs="debug\moc_QGLViewerWidget.cpp"
@@ -629,5 +628,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QGLViewerWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QGLViewerWidget.h -o release\moc_QGLViewerWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QGLViewerWidget.h&quot; -o &quot;release\moc_QGLViewerWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QGLViewerWidget.h"
 						Outputs="release\moc_QGLViewerWidget.cpp"
@@ -644,5 +643,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QPanelWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QPanelWidget.h -o debug\moc_QPanelWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QPanelWidget.h&quot; -o &quot;debug\moc_QPanelWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QPanelWidget.h"
 						Outputs="debug\moc_QPanelWidget.cpp"
@@ -655,5 +654,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QPanelWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QPanelWidget.h -o release\moc_QPanelWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QPanelWidget.h&quot; -o &quot;release\moc_QPanelWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QPanelWidget.h"
 						Outputs="release\moc_QPanelWidget.cpp"
@@ -670,5 +669,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QPreferenceDialog.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QPreferenceDialog.h -o debug\moc_QPreferenceDialog.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QPreferenceDialog.h&quot; -o &quot;debug\moc_QPreferenceDialog.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QPreferenceDialog.h"
 						Outputs="debug\moc_QPreferenceDialog.cpp"
@@ -681,5 +680,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QPreferenceDialog.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QPreferenceDialog.h -o release\moc_QPreferenceDialog.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QPreferenceDialog.h&quot; -o &quot;release\moc_QPreferenceDialog.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QPreferenceDialog.h"
 						Outputs="release\moc_QPreferenceDialog.cpp"
@@ -696,5 +695,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QProjectionMatrixWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QProjectionMatrixWidget.h -o debug\moc_QProjectionMatrixWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QProjectionMatrixWidget.h&quot; -o &quot;debug\moc_QProjectionMatrixWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QProjectionMatrixWidget.h"
 						Outputs="debug\moc_QProjectionMatrixWidget.cpp"
@@ -707,5 +706,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QProjectionMatrixWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QProjectionMatrixWidget.h -o release\moc_QProjectionMatrixWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QProjectionMatrixWidget.h&quot; -o &quot;release\moc_QProjectionMatrixWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QProjectionMatrixWidget.h"
 						Outputs="release\moc_QProjectionMatrixWidget.cpp"
@@ -722,5 +721,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QProjectorWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QProjectorWindow.h -o debug\moc_QProjectorWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QProjectorWindow.h&quot; -o &quot;debug\moc_QProjectorWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QProjectorWindow.h"
 						Outputs="debug\moc_QProjectorWindow.cpp"
@@ -733,5 +732,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QProjectorWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QProjectorWindow.h -o release\moc_QProjectorWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QProjectorWindow.h&quot; -o &quot;release\moc_QProjectorWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QProjectorWindow.h"
 						Outputs="release\moc_QProjectorWindow.cpp"
@@ -748,5 +747,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QSceneViewerWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QSceneViewerWindow.h -o debug\moc_QSceneViewerWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QSceneViewerWindow.h&quot; -o &quot;debug\moc_QSceneViewerWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QSceneViewerWindow.h"
 						Outputs="debug\moc_QSceneViewerWindow.cpp"
@@ -759,5 +758,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QSceneViewerWindow.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QSceneViewerWindow.h -o release\moc_QSceneViewerWindow.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QSceneViewerWindow.h&quot; -o &quot;release\moc_QSceneViewerWindow.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QSceneViewerWindow.h"
 						Outputs="release\moc_QSceneViewerWindow.cpp"
@@ -774,5 +773,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QSceneWidget.h -o debug\moc_QSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QSceneWidget.h&quot; -o &quot;debug\moc_QSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QSceneWidget.h"
 						Outputs="debug\moc_QSceneWidget.cpp"
@@ -785,5 +784,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QSceneWidget.h -o release\moc_QSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QSceneWidget.h&quot; -o &quot;release\moc_QSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QSceneWidget.h"
 						Outputs="release\moc_QSceneWidget.cpp"
@@ -800,5 +799,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QScreenWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QScreenWidget.h -o debug\moc_QScreenWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QScreenWidget.h&quot; -o &quot;debug\moc_QScreenWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QScreenWidget.h"
 						Outputs="debug\moc_QScreenWidget.cpp"
@@ -811,5 +810,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QScreenWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QScreenWidget.h -o release\moc_QScreenWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QScreenWidget.h&quot; -o &quot;release\moc_QScreenWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QScreenWidget.h"
 						Outputs="release\moc_QScreenWidget.cpp"
@@ -826,5 +825,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QTransformMatrixWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QTransformMatrixWidget.h -o debug\moc_QTransformMatrixWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QTransformMatrixWidget.h&quot; -o &quot;debug\moc_QTransformMatrixWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QTransformMatrixWidget.h"
 						Outputs="debug\moc_QTransformMatrixWidget.cpp"
@@ -837,5 +836,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\gui\QTransformMatrixWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\gui\QTransformMatrixWidget.h -o release\moc_QTransformMatrixWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\gui\QTransformMatrixWidget.h&quot; -o &quot;release\moc_QTransformMatrixWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\gui\QTransformMatrixWidget.h"
 						Outputs="release\moc_QTransformMatrixWidget.cpp"
@@ -852,5 +851,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\RSync.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\RSync.h -o debug\moc_RSync.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\RSync.h&quot; -o &quot;debug\moc_RSync.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\RSync.h"
 						Outputs="debug\moc_RSync.cpp"
@@ -863,5 +862,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\RSync.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\RSync.h -o release\moc_RSync.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\RSync.h&quot; -o &quot;release\moc_RSync.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\RSync.h"
 						Outputs="release\moc_RSync.cpp"
@@ -878,5 +877,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Scene.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Scene.h -o debug\moc_Scene.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Scene.h&quot; -o &quot;debug\moc_Scene.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Scene.h"
 						Outputs="debug\moc_Scene.cpp"
@@ -889,5 +888,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Scene.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Scene.h -o release\moc_Scene.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Scene.h&quot; -o &quot;release\moc_Scene.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Scene.h"
 						Outputs="release\moc_Scene.cpp"
@@ -904,5 +903,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Screen.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Screen.h -o debug\moc_Screen.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Screen.h&quot; -o &quot;debug\moc_Screen.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Screen.h"
 						Outputs="debug\moc_Screen.cpp"
@@ -915,5 +914,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC include\Screen.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtNetwork&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..&quot; -I&quot;.&quot; -I&quot;include&quot; -I&quot;include\math&quot; -I&quot;include\gui&quot; -I&quot;include\screen&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 include\Screen.h -o release\moc_Screen.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\Screen.h&quot; -o &quot;release\moc_Screen.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;include\Screen.h"
 						Outputs="release\moc_Screen.cpp"
@@ -938,5 +937,5 @@
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing ScreenModel.h..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;include\screen\ScreenModel.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenModel.cpp&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\screen\ScreenModel.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenModel.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;include\screen\ScreenModel.h"
 						Outputs="&quot;$(ConfigurationName)\moc_ScreenModel.cpp&quot;"
@@ -949,5 +948,5 @@
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing ScreenModel.h..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;include\screen\ScreenModel.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenModel.cpp&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\screen\ScreenModel.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenModel.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;include\screen\ScreenModel.h"
 						Outputs="&quot;$(ConfigurationName)\moc_ScreenModel.cpp&quot;"
@@ -968,5 +967,5 @@
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing ScreenShape.h..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;include\screen\ScreenShape.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenShape.cpp&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\screen\ScreenShape.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenShape.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;include\screen\ScreenShape.h"
 						Outputs="&quot;$(ConfigurationName)\moc_ScreenShape.cpp&quot;"
@@ -979,5 +978,5 @@
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing ScreenShape.h..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;include\screen\ScreenShape.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenShape.cpp&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\.&quot; -I&quot;.\.&quot; -I&quot;.\include\.&quot; -I&quot;.\include\math\.&quot; -I&quot;.\include\gui\.&quot; -I&quot;.\include\screen\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;include\screen\ScreenShape.h&quot; -o &quot;$(ConfigurationName)\moc_ScreenShape.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;include\screen\ScreenShape.h"
 						Outputs="&quot;$(ConfigurationName)\moc_ScreenShape.cpp&quot;"
@@ -1004,4 +1003,16 @@
 			>
 			<File
+				RelativePath="release\moc_Channel.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="debug\moc_Channel.cpp"
 				>
@@ -1016,5 +1027,5 @@
 			</File>
 			<File
-				RelativePath="release\moc_Channel.cpp"
+				RelativePath="release\moc_Frustum.cpp"
 				>
 				<FileConfiguration
@@ -1040,8 +1051,8 @@
 			</File>
 			<File
-				RelativePath="release\moc_Frustum.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
+				RelativePath=".\debug\moc_interfaces.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
@@ -1064,16 +1075,4 @@
 			</File>
 			<File
-				RelativePath=".\debug\moc_interfaces.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="release\moc_plugindialog.cpp"
 				>
@@ -1100,4 +1099,16 @@
 			</File>
 			<File
+				RelativePath="debug\moc_QChannelManagerWidget.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="release\moc_QChannelManagerWidget.cpp"
 				>
@@ -1112,8 +1123,8 @@
 			</File>
 			<File
-				RelativePath="debug\moc_QChannelManagerWidget.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
+				RelativePath="release\moc_QChannelWidget.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
@@ -1136,8 +1147,8 @@
 			</File>
 			<File
-				RelativePath="release\moc_QChannelWidget.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
+				RelativePath="debug\moc_QClientWindow.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
@@ -1160,16 +1171,4 @@
 			</File>
 			<File
-				RelativePath="debug\moc_QClientWindow.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="debug\moc_QDesignViewWidget.cpp"
 				>
@@ -1196,4 +1195,16 @@
 			</File>
 			<File
+				RelativePath="release\moc_QDesignViewWindow.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="debug\moc_QDesignViewWindow.cpp"
 				>
@@ -1208,5 +1219,5 @@
 			</File>
 			<File
-				RelativePath="release\moc_QDesignViewWindow.cpp"
+				RelativePath="release\moc_QGLViewerWidget.cpp"
 				>
 				<FileConfiguration
@@ -1232,5 +1243,5 @@
 			</File>
 			<File
-				RelativePath="release\moc_QGLViewerWidget.cpp"
+				RelativePath="release\moc_QPanelWidget.cpp"
 				>
 				<FileConfiguration
@@ -1256,16 +1267,4 @@
 			</File>
 			<File
-				RelativePath="release\moc_QPanelWidget.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="release\moc_QPreferenceDialog.cpp"
 				>
@@ -1292,4 +1291,16 @@
 			</File>
 			<File
+				RelativePath="release\moc_QProjectionMatrixWidget.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="debug\moc_QProjectionMatrixWidget.cpp"
 				>
@@ -1304,5 +1315,5 @@
 			</File>
 			<File
-				RelativePath="release\moc_QProjectionMatrixWidget.cpp"
+				RelativePath="release\moc_QProjectorWindow.cpp"
 				>
 				<FileConfiguration
@@ -1328,16 +1339,4 @@
 			</File>
 			<File
-				RelativePath="release\moc_QProjectorWindow.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="debug\moc_QSceneViewerWindow.cpp"
 				>
@@ -1364,4 +1363,16 @@
 			</File>
 			<File
+				RelativePath="debug\moc_QSceneWidget.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="release\moc_QSceneWidget.cpp"
 				>
@@ -1376,5 +1387,5 @@
 			</File>
 			<File
-				RelativePath="debug\moc_QSceneWidget.cpp"
+				RelativePath="debug\moc_QScreenWidget.cpp"
 				>
 				<FileConfiguration
@@ -1400,8 +1411,8 @@
 			</File>
 			<File
-				RelativePath="debug\moc_QScreenWidget.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
+				RelativePath="release\moc_QTransformMatrixWidget.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
@@ -1424,16 +1435,4 @@
 			</File>
 			<File
-				RelativePath="release\moc_QTransformMatrixWidget.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="release\moc_RSync.cpp"
 				>
@@ -1460,4 +1459,16 @@
 			</File>
 			<File
+				RelativePath="release\moc_Scene.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="debug\moc_Scene.cpp"
 				>
@@ -1472,5 +1483,5 @@
 			</File>
 			<File
-				RelativePath="release\moc_Scene.cpp"
+				RelativePath="release\moc_Screen.cpp"
 				>
 				<FileConfiguration
@@ -1496,8 +1507,8 @@
 			</File>
 			<File
-				RelativePath="release\moc_Screen.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
+				RelativePath=".\debug\moc_ScreenModel.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
@@ -1512,16 +1523,4 @@
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\debug\moc_ScreenModel.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
@@ -2236,4 +2235,8 @@
 			Value="4.5.1"
 		/>
+		<Global
+			Name="QtVersion Win32"
+			Value="$(DefaultQtVersion)"
+		/>
 	</Globals>
 </VisualStudioProject>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qchannelmanagerwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qchannelmanagerwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qchannelmanagerwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qchannelmanagerwidget.ui'
+** Form generated from reading UI file 'qchannelmanagerwidget.ui'
 **
-** Created: Mon 27. Apr 14:25:46 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:08 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -45,5 +45,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         vboxLayout = new QVBoxLayout();
@@ -52,5 +52,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -66,5 +66,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         spacerItem = new QSpacerItem(16, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -101,5 +101,4 @@
         addButton->setText(QApplication::translate("QChannelManagerWidget", "Add", 0, QApplication::UnicodeUTF8));
         removeButton->setText(QApplication::translate("QChannelManagerWidget", "Remove", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QChannelManagerWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qchannelwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qchannelwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qchannelwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qchannelwidget.ui'
+** Form generated from reading UI file 'qchannelwidget.ui'
 **
-** Created: Tue 28. Apr 15:36:10 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:08 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -104,5 +104,5 @@
         vboxLayout->setSpacing(6);
 #endif
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         hboxLayout = new QHBoxLayout();
@@ -111,5 +111,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
@@ -137,5 +137,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(4);
+        hboxLayout1->setContentsMargins(4, 4, 4, 4);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout1 = new QVBoxLayout();
@@ -144,5 +144,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(0);
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
@@ -156,5 +156,5 @@
         hboxLayout2->setSpacing(6);
 #endif
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         overlayImageLabel = new QLabel(overlayGroupBox);
@@ -198,10 +198,10 @@
         page = new QWidget();
         page->setObjectName(QString::fromUtf8("page"));
-        page->setGeometry(QRect(0, 0, 232, 198));
+        page->setGeometry(QRect(0, 0, 158, 58));
         hboxLayout3 = new QHBoxLayout(page);
 #ifndef Q_OS_MAC
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(0);
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         vboxLayout2 = new QVBoxLayout();
@@ -210,5 +210,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout2->setMargin(0);
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
@@ -218,5 +218,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
@@ -238,5 +238,5 @@
         hboxLayout5->setSpacing(6);
 #endif
-        hboxLayout5->setMargin(0);
+        hboxLayout5->setContentsMargins(0, 0, 0, 0);
         hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
         remoteFullScreenCheckBox = new QCheckBox(page);
@@ -268,8 +268,8 @@
         page_2 = new QWidget();
         page_2->setObjectName(QString::fromUtf8("page_2"));
-        page_2->setGeometry(QRect(0, 0, 232, 262));
+        page_2->setGeometry(QRect(0, 0, 232, 267));
         vboxLayout3 = new QVBoxLayout(page_2);
         vboxLayout3->setSpacing(0);
-        vboxLayout3->setMargin(0);
+        vboxLayout3->setContentsMargins(0, 0, 0, 0);
         vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
         hboxLayout6 = new QHBoxLayout();
@@ -278,5 +278,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout6->setMargin(0);
+        hboxLayout6->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout6->setObjectName(QString::fromUtf8("hboxLayout6"));
@@ -316,5 +316,5 @@
         hboxLayout7->setSpacing(6);
 #endif
-        hboxLayout7->setMargin(4);
+        hboxLayout7->setContentsMargins(4, 4, 4, 4);
         hboxLayout7->setObjectName(QString::fromUtf8("hboxLayout7"));
         hboxLayout8 = new QHBoxLayout();
@@ -323,5 +323,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout8->setMargin(0);
+        hboxLayout8->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout8->setObjectName(QString::fromUtf8("hboxLayout8"));
@@ -358,5 +358,5 @@
         hboxLayout9 = new QHBoxLayout();
         hboxLayout9->setSpacing(0);
-        hboxLayout9->setMargin(0);
+        hboxLayout9->setContentsMargins(0, 0, 0, 0);
         hboxLayout9->setObjectName(QString::fromUtf8("hboxLayout9"));
         spacerItem3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -380,13 +380,13 @@
         page_3 = new QWidget();
         page_3->setObjectName(QString::fromUtf8("page_3"));
-        page_3->setGeometry(QRect(0, 0, 232, 349));
+        page_3->setGeometry(QRect(0, 0, 98, 28));
         vboxLayout4 = new QVBoxLayout(page_3);
         vboxLayout4->setSpacing(0);
-        vboxLayout4->setMargin(0);
+        vboxLayout4->setContentsMargins(0, 0, 0, 0);
         vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
         vboxLayout5 = new QVBoxLayout();
         vboxLayout5->setSpacing(0);
 #ifndef Q_OS_MAC
-        vboxLayout5->setMargin(0);
+        vboxLayout5->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout5->setObjectName(QString::fromUtf8("vboxLayout5"));
@@ -405,5 +405,5 @@
         hboxLayout10 = new QHBoxLayout();
         hboxLayout10->setSpacing(0);
-        hboxLayout10->setMargin(0);
+        hboxLayout10->setContentsMargins(0, 0, 0, 0);
         hboxLayout10->setObjectName(QString::fromUtf8("hboxLayout10"));
         spacerItem5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -439,5 +439,5 @@
         hboxLayout11->setSpacing(6);
 #endif
-        hboxLayout11->setMargin(0);
+        hboxLayout11->setContentsMargins(0, 0, 0, 0);
         hboxLayout11->setObjectName(QString::fromUtf8("hboxLayout11"));
         spacerItem8 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -501,5 +501,4 @@
         toolBox->setItemText(toolBox->indexOf(page_3), QApplication::translate("QChannelWidget", "View", 0, QApplication::UnicodeUTF8));
         windowButton->setText(QApplication::translate("QChannelWidget", "Open Window...", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QChannelWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qclientwindow.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qclientwindow.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qclientwindow.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qclientwindow.ui'
+** Form generated from reading UI file 'qclientwindow.ui'
 **
-** Created: Mon 27. Apr 14:25:56 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:27 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -48,5 +48,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(2);
+        hboxLayout->setContentsMargins(2, 2, 2, 2);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         logEdit = new QTextEdit(centralWidget);
@@ -61,5 +61,5 @@
         menuBar = new QMenuBar(QClientWindow);
         menuBar->setObjectName(QString::fromUtf8("menuBar"));
-        menuBar->setGeometry(QRect(0, 0, 344, 18));
+        menuBar->setGeometry(QRect(0, 0, 344, 21));
         menu_File = new QMenu(menuBar);
         menu_File->setObjectName(QString::fromUtf8("menu_File"));
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qdesignviewwindow.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qdesignviewwindow.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qdesignviewwindow.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qdesignviewwindow.ui'
+** Form generated from reading UI file 'qdesignviewwindow.ui'
 **
-** Created: Wed 2. Sep 15:07:30 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:26 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -76,45 +76,45 @@
         QDesignViewWindow->resize(960, 700);
         QIcon icon;
-        icon.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/projDesigner.png")), QIcon::Normal, QIcon::Off);
+        icon.addFile(QString::fromUtf8(":/new/prefix1/Resources/projDesigner.png"), QSize(), QIcon::Normal, QIcon::Off);
         QDesignViewWindow->setWindowIcon(icon);
         actionFileNew = new QAction(QDesignViewWindow);
         actionFileNew->setObjectName(QString::fromUtf8("actionFileNew"));
         QIcon icon1;
-        icon1.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/new.png")), QIcon::Normal, QIcon::Off);
+        icon1.addFile(QString::fromUtf8(":/new/prefix1/Resources/new.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileNew->setIcon(icon1);
         actionFileOpen = new QAction(QDesignViewWindow);
         actionFileOpen->setObjectName(QString::fromUtf8("actionFileOpen"));
         QIcon icon2;
-        icon2.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/open.png")), QIcon::Normal, QIcon::Off);
+        icon2.addFile(QString::fromUtf8(":/new/prefix1/Resources/open.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileOpen->setIcon(icon2);
         actionFileSave = new QAction(QDesignViewWindow);
         actionFileSave->setObjectName(QString::fromUtf8("actionFileSave"));
         QIcon icon3;
-        icon3.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/save.png")), QIcon::Normal, QIcon::Off);
+        icon3.addFile(QString::fromUtf8(":/new/prefix1/Resources/save.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileSave->setIcon(icon3);
         actionFileSaveAs = new QAction(QDesignViewWindow);
         actionFileSaveAs->setObjectName(QString::fromUtf8("actionFileSaveAs"));
         QIcon icon4;
-        icon4.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/saveAs.png")), QIcon::Normal, QIcon::Off);
+        icon4.addFile(QString::fromUtf8(":/new/prefix1/Resources/saveAs.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileSaveAs->setIcon(icon4);
         actionFileSyncClients = new QAction(QDesignViewWindow);
         actionFileSyncClients->setObjectName(QString::fromUtf8("actionFileSyncClients"));
         QIcon icon5;
-        icon5.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/sync.png")), QIcon::Normal, QIcon::Off);
+        icon5.addFile(QString::fromUtf8(":/new/prefix1/Resources/sync.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileSyncClients->setIcon(icon5);
         actionFileExit = new QAction(QDesignViewWindow);
         actionFileExit->setObjectName(QString::fromUtf8("actionFileExit"));
         QIcon icon6;
-        icon6.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/exit.png")), QIcon::Normal, QIcon::Off);
+        icon6.addFile(QString::fromUtf8(":/new/prefix1/Resources/exit.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileExit->setIcon(icon6);
         actionFileExitAll = new QAction(QDesignViewWindow);
         actionFileExitAll->setObjectName(QString::fromUtf8("actionFileExitAll"));
         QIcon icon7;
-        icon7.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/exitAll.png")), QIcon::Normal, QIcon::Off);
+        icon7.addFile(QString::fromUtf8(":/new/prefix1/Resources/exitAll.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileExitAll->setIcon(icon7);
         actionEditDesignDistortionMap = new QAction(QDesignViewWindow);
         actionEditDesignDistortionMap->setObjectName(QString::fromUtf8("actionEditDesignDistortionMap"));
         QIcon icon8;
-        icon8.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/distortionMode.png")), QIcon::Normal, QIcon::Off);
+        icon8.addFile(QString::fromUtf8(":/new/prefix1/Resources/distortionMode.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionEditDesignDistortionMap->setIcon(icon8);
         actionEditDesignDistortionMap->setShortcutContext(Qt::ApplicationShortcut);
@@ -122,5 +122,5 @@
         actionEditDesignBlendMap->setObjectName(QString::fromUtf8("actionEditDesignBlendMap"));
         QIcon icon9;
-        icon9.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/blendMode.png")), QIcon::Normal, QIcon::Off);
+        icon9.addFile(QString::fromUtf8(":/new/prefix1/Resources/blendMode.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionEditDesignBlendMap->setIcon(icon9);
         actionEditDesignBlendMap->setShortcutContext(Qt::ApplicationShortcut);
@@ -128,5 +128,5 @@
         actionEditPreference->setObjectName(QString::fromUtf8("actionEditPreference"));
         QIcon icon10;
-        icon10.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/settings.png")), QIcon::Normal, QIcon::Off);
+        icon10.addFile(QString::fromUtf8(":/new/prefix1/Resources/settings.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionEditPreference->setIcon(icon10);
         actionEditPreference->setShortcutContext(Qt::ApplicationShortcut);
@@ -160,5 +160,5 @@
         actionHelpHelp->setObjectName(QString::fromUtf8("actionHelpHelp"));
         QIcon icon11;
-        icon11.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/help.png")), QIcon::Normal, QIcon::Off);
+        icon11.addFile(QString::fromUtf8(":/new/prefix1/Resources/help.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionHelpHelp->setIcon(icon11);
         actionHelpAbout = new QAction(QDesignViewWindow);
@@ -168,15 +168,15 @@
         actionFileExportDataset->setObjectName(QString::fromUtf8("actionFileExportDataset"));
         QIcon icon12;
-        icon12.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/export.png")), QIcon::Normal, QIcon::Off);
+        icon12.addFile(QString::fromUtf8(":/new/prefix1/Resources/export.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionFileExportDataset->setIcon(icon12);
         actionHelpPlugins = new QAction(QDesignViewWindow);
         actionHelpPlugins->setObjectName(QString::fromUtf8("actionHelpPlugins"));
         QIcon icon13;
-        icon13.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/plugins.png")), QIcon::Normal, QIcon::Off);
+        icon13.addFile(QString::fromUtf8(":/new/prefix1/Resources/plugins.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionHelpPlugins->setIcon(icon13);
         actionHelpAbout_Qt = new QAction(QDesignViewWindow);
         actionHelpAbout_Qt->setObjectName(QString::fromUtf8("actionHelpAbout_Qt"));
         QIcon icon14;
-        icon14.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/aboutQt.png")), QIcon::Normal, QIcon::Off);
+        icon14.addFile(QString::fromUtf8(":/new/prefix1/Resources/aboutQt.png"), QSize(), QIcon::Normal, QIcon::Off);
         actionHelpAbout_Qt->setIcon(icon14);
         centralWidget = new QWidget(QDesignViewWindow);
@@ -186,5 +186,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         splitter = new QSplitter(centralWidget);
@@ -213,5 +213,5 @@
         menuBar = new QMenuBar(QDesignViewWindow);
         menuBar->setObjectName(QString::fromUtf8("menuBar"));
-        menuBar->setGeometry(QRect(0, 0, 960, 22));
+        menuBar->setGeometry(QRect(0, 0, 960, 21));
         menuEdit = new QMenu(menuBar);
         menuEdit->setObjectName(QString::fromUtf8("menuEdit"));
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qpanelwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qpanelwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qpanelwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qpanelwidget.ui'
+** Form generated from reading UI file 'qpanelwidget.ui'
 **
-** Created: Mon 27. Apr 14:25:47 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:08 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -60,5 +60,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         tabWidget = new QTabWidget(QPanelWidget);
@@ -70,5 +70,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(4);
+        hboxLayout1->setContentsMargins(4, 4, 4, 4);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout = new QVBoxLayout();
@@ -77,5 +77,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -89,5 +89,5 @@
         channelGroup = new QGroupBox(channelsTab);
         channelGroup->setObjectName(QString::fromUtf8("channelGroup"));
-        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(5));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -98,5 +98,5 @@
         hboxLayout2->setSpacing(6);
 #endif
-        hboxLayout2->setMargin(4);
+        hboxLayout2->setContentsMargins(4, 4, 4, 4);
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         channel = new projection::QChannelWidget(channelGroup);
@@ -123,5 +123,5 @@
         vboxLayout1->setSpacing(6);
 #endif
-        vboxLayout1->setMargin(0);
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
         screen = new projection::QScreenWidget(screenTab);
@@ -141,5 +141,5 @@
         vboxLayout2->setSpacing(6);
 #endif
-        vboxLayout2->setMargin(0);
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
         scene = new projection::QSceneWidget(sceneTab);
@@ -171,5 +171,4 @@
         tabWidget->setTabText(tabWidget->indexOf(screenTab), QApplication::translate("QPanelWidget", "Screen", 0, QApplication::UnicodeUTF8));
         tabWidget->setTabText(tabWidget->indexOf(sceneTab), QApplication::translate("QPanelWidget", "Scene", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QPanelWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qpreferencedialog.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qpreferencedialog.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qpreferencedialog.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qpreferencedialog.ui'
+** Form generated from reading UI file 'qpreferencedialog.ui'
 **
-** Created: Tue 28. Apr 15:36:09 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:05 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -90,5 +90,5 @@
         QPreferenceDialog->resize(345, 357);
         QIcon icon;
-        icon.addPixmap(QPixmap(QString::fromUtf8(":/new/prefix1/Resources/settings.png")), QIcon::Normal, QIcon::Off);
+        icon.addFile(QString::fromUtf8(":/new/prefix1/Resources/settings.png"), QSize(), QIcon::Normal, QIcon::Off);
         QPreferenceDialog->setWindowIcon(icon);
         hboxLayout = new QHBoxLayout(QPreferenceDialog);
@@ -96,5 +96,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(4);
+        hboxLayout->setContentsMargins(4, 4, 4, 4);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         vboxLayout = new QVBoxLayout();
@@ -103,5 +103,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -112,5 +112,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(4);
+        hboxLayout1->setContentsMargins(4, 4, 4, 4);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         hboxLayout2 = new QHBoxLayout();
@@ -119,5 +119,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
@@ -160,5 +160,5 @@
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(4);
+        hboxLayout3->setContentsMargins(4, 4, 4, 4);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         vboxLayout1 = new QVBoxLayout();
@@ -167,5 +167,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(0);
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
@@ -175,5 +175,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
@@ -212,5 +212,5 @@
         hboxLayout5->setSpacing(6);
 #endif
-        hboxLayout5->setMargin(4);
+        hboxLayout5->setContentsMargins(4, 4, 4, 4);
         hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
         vboxLayout2 = new QVBoxLayout();
@@ -219,5 +219,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout2->setMargin(0);
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
@@ -227,5 +227,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout6->setMargin(0);
+        hboxLayout6->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout6->setObjectName(QString::fromUtf8("hboxLayout6"));
@@ -280,5 +280,5 @@
         hboxLayout7->setSpacing(6);
 #endif
-        hboxLayout7->setMargin(4);
+        hboxLayout7->setContentsMargins(4, 4, 4, 4);
         hboxLayout7->setObjectName(QString::fromUtf8("hboxLayout7"));
         vboxLayout3 = new QVBoxLayout();
@@ -287,5 +287,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout3->setMargin(0);
+        vboxLayout3->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
@@ -295,5 +295,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout8->setMargin(0);
+        hboxLayout8->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout8->setObjectName(QString::fromUtf8("hboxLayout8"));
@@ -331,5 +331,5 @@
         hboxLayout9->setSpacing(6);
 #endif
-        hboxLayout9->setMargin(0);
+        hboxLayout9->setContentsMargins(0, 0, 0, 0);
         hboxLayout9->setObjectName(QString::fromUtf8("hboxLayout9"));
         spacerItem4 = new QSpacerItem(10, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
@@ -342,5 +342,5 @@
 #endif
 #ifndef Q_OS_MAC
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
@@ -462,5 +462,4 @@
         exportBlendMapPatternLabel->setText(QApplication::translate("QPreferenceDialog", "Blend map file", 0, QApplication::UnicodeUTF8));
         pB_ClosePrefDiag->setText(QApplication::translate("QPreferenceDialog", "Close", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QPreferenceDialog);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qprojectionmatrixwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qprojectionmatrixwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qprojectionmatrixwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qprojectionmatrixwidget.ui'
+** Form generated from reading UI file 'qprojectionmatrixwidget.ui'
 **
-** Created: Mon 27. Apr 14:25:41 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:03 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -53,10 +53,10 @@
         if (QProjectionMatrixWidget->objectName().isEmpty())
             QProjectionMatrixWidget->setObjectName(QString::fromUtf8("QProjectionMatrixWidget"));
-        QProjectionMatrixWidget->resize(169, 110);
+        QProjectionMatrixWidget->resize(190, 110);
         hboxLayout = new QHBoxLayout(QProjectionMatrixWidget);
 #ifndef Q_OS_MAC
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         projectionGroup = new QGroupBox(QProjectionMatrixWidget);
@@ -66,5 +66,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout = new QVBoxLayout();
@@ -72,5 +72,5 @@
         vboxLayout->setSpacing(6);
 #endif
-        vboxLayout->setMargin(4);
+        vboxLayout->setContentsMargins(4, 4, 4, 4);
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         hboxLayout2 = new QHBoxLayout();
@@ -79,5 +79,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
@@ -109,5 +109,5 @@
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(0);
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         nearLabel = new QLabel(projectionGroup);
@@ -138,5 +138,5 @@
         hboxLayout4->setSpacing(6);
 #endif
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
         offaxisLabel = new QLabel(projectionGroup);
@@ -194,5 +194,4 @@
         offaxisXLabel->setText(QApplication::translate("QProjectionMatrixWidget", "X", 0, QApplication::UnicodeUTF8));
         offaxisYLabel->setText(QApplication::translate("QProjectionMatrixWidget", "Y", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QProjectionMatrixWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qscenewidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qscenewidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qscenewidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qscenewidget.ui'
+** Form generated from reading UI file 'qscenewidget.ui'
 **
-** Created: Mon 27. Apr 14:25:31 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:34:59 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -69,5 +69,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(4);
+        hboxLayout->setContentsMargins(4, 4, 4, 4);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         vboxLayout = new QVBoxLayout();
@@ -76,5 +76,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -91,5 +91,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(4);
+        hboxLayout1->setContentsMargins(4, 4, 4, 4);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout1 = new QVBoxLayout();
@@ -98,5 +98,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(0);
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
@@ -106,5 +106,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
@@ -148,5 +148,5 @@
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(0);
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         sceneSizeLabel = new QLabel(QSceneWidget);
@@ -172,5 +172,5 @@
         hboxLayout4->setSpacing(6);
 #endif
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
         gridCheckBox = new QCheckBox(QSceneWidget);
@@ -201,5 +201,5 @@
         hboxLayout5->setSpacing(6);
 #endif
-        hboxLayout5->setMargin(0);
+        hboxLayout5->setContentsMargins(0, 0, 0, 0);
         hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
         spacerItem3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -249,5 +249,4 @@
         centerViewButton->setText(QApplication::translate("QSceneWidget", "Center View", 0, QApplication::UnicodeUTF8));
         viewAllButton->setText(QApplication::translate("QSceneWidget", "ViewAll", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QSceneWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qscreenwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qscreenwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qscreenwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qscreenwidget.ui'
+** Form generated from reading UI file 'qscreenwidget.ui'
 **
-** Created: Mon 27. Apr 14:25:27 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:34:56 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -111,10 +111,10 @@
         if (QScreenWidget->objectName().isEmpty())
             QScreenWidget->setObjectName(QString::fromUtf8("QScreenWidget"));
-        QScreenWidget->resize(183, 222);
+        QScreenWidget->resize(197, 242);
         hboxLayout = new QHBoxLayout(QScreenWidget);
 #ifndef Q_OS_MAC
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(4);
+        hboxLayout->setContentsMargins(4, 4, 4, 4);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         vboxLayout = new QVBoxLayout();
@@ -123,5 +123,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -138,5 +138,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(4);
+        hboxLayout1->setContentsMargins(4, 4, 4, 4);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout1 = new QVBoxLayout();
@@ -145,5 +145,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(0);
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
@@ -153,5 +153,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
@@ -182,5 +182,5 @@
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(4);
+        hboxLayout3->setContentsMargins(4, 4, 4, 4);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         vboxLayout2 = new QVBoxLayout();
@@ -189,5 +189,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout2->setMargin(0);
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
@@ -197,5 +197,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
@@ -217,5 +217,5 @@
         hboxLayout5->setSpacing(6);
 #endif
-        hboxLayout5->setMargin(0);
+        hboxLayout5->setContentsMargins(0, 0, 0, 0);
         hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
         domeAzimResLabel = new QLabel(domePage);
@@ -226,6 +226,6 @@
         domeAzimResSpinBox = new QSpinBox(domePage);
         domeAzimResSpinBox->setObjectName(QString::fromUtf8("domeAzimResSpinBox"));
+        domeAzimResSpinBox->setMinimum(2);
         domeAzimResSpinBox->setMaximum(128);
-        domeAzimResSpinBox->setMinimum(2);
 
         hboxLayout5->addWidget(domeAzimResSpinBox);
@@ -238,5 +238,5 @@
         hboxLayout6->setSpacing(6);
 #endif
-        hboxLayout6->setMargin(0);
+        hboxLayout6->setContentsMargins(0, 0, 0, 0);
         hboxLayout6->setObjectName(QString::fromUtf8("hboxLayout6"));
         domeElevResLabel = new QLabel(domePage);
@@ -247,6 +247,6 @@
         domeElevResSpinBox = new QSpinBox(domePage);
         domeElevResSpinBox->setObjectName(QString::fromUtf8("domeElevResSpinBox"));
+        domeElevResSpinBox->setMinimum(2);
         domeElevResSpinBox->setMaximum(128);
-        domeElevResSpinBox->setMinimum(2);
 
         hboxLayout6->addWidget(domeElevResSpinBox);
@@ -259,5 +259,5 @@
         hboxLayout7->setSpacing(6);
 #endif
-        hboxLayout7->setMargin(0);
+        hboxLayout7->setContentsMargins(0, 0, 0, 0);
         hboxLayout7->setObjectName(QString::fromUtf8("hboxLayout7"));
         domeSubdivLabel = new QLabel(domePage);
@@ -268,6 +268,6 @@
         domeSubdivSpinBox = new QSpinBox(domePage);
         domeSubdivSpinBox->setObjectName(QString::fromUtf8("domeSubdivSpinBox"));
+        domeSubdivSpinBox->setMinimum(1);
         domeSubdivSpinBox->setMaximum(8);
-        domeSubdivSpinBox->setMinimum(1);
 
         hboxLayout7->addWidget(domeSubdivSpinBox);
@@ -295,5 +295,5 @@
         hboxLayout8->setSpacing(6);
 #endif
-        hboxLayout8->setMargin(4);
+        hboxLayout8->setContentsMargins(4, 4, 4, 4);
         hboxLayout8->setObjectName(QString::fromUtf8("hboxLayout8"));
         vboxLayout3 = new QVBoxLayout();
@@ -302,5 +302,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout3->setMargin(0);
+        vboxLayout3->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
@@ -310,5 +310,5 @@
 #endif
 #ifndef Q_OS_MAC
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
@@ -325,6 +325,6 @@
         planeHorResSpinBox = new QSpinBox(planePage);
         planeHorResSpinBox->setObjectName(QString::fromUtf8("planeHorResSpinBox"));
+        planeHorResSpinBox->setMinimum(1);
         planeHorResSpinBox->setMaximum(128);
-        planeHorResSpinBox->setMinimum(1);
 
         gridLayout->addWidget(planeHorResSpinBox, 0, 3, 1, 1);
@@ -352,6 +352,6 @@
         planeVertResSpinBox = new QSpinBox(planePage);
         planeVertResSpinBox->setObjectName(QString::fromUtf8("planeVertResSpinBox"));
+        planeVertResSpinBox->setMinimum(1);
         planeVertResSpinBox->setMaximum(128);
-        planeVertResSpinBox->setMinimum(1);
 
         gridLayout->addWidget(planeVertResSpinBox, 1, 3, 1, 1);
@@ -374,5 +374,5 @@
         hboxLayout9->setSpacing(6);
 #endif
-        hboxLayout9->setMargin(4);
+        hboxLayout9->setContentsMargins(4, 4, 4, 4);
         hboxLayout9->setObjectName(QString::fromUtf8("hboxLayout9"));
         vboxLayout4 = new QVBoxLayout();
@@ -381,5 +381,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout4->setMargin(0);
+        vboxLayout4->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
@@ -389,11 +389,11 @@
 #endif
 #ifndef Q_OS_MAC
-        gridLayout1->setMargin(0);
+        gridLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
         gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
         boxVertResSpinBox = new QSpinBox(boxPage);
         boxVertResSpinBox->setObjectName(QString::fromUtf8("boxVertResSpinBox"));
+        boxVertResSpinBox->setMinimum(1);
         boxVertResSpinBox->setMaximum(128);
-        boxVertResSpinBox->setMinimum(1);
 
         gridLayout1->addWidget(boxVertResSpinBox, 1, 3, 1, 1);
@@ -426,6 +426,6 @@
         boxHorResSpinBox = new QSpinBox(boxPage);
         boxHorResSpinBox->setObjectName(QString::fromUtf8("boxHorResSpinBox"));
+        boxHorResSpinBox->setMinimum(1);
         boxHorResSpinBox->setMaximum(128);
-        boxHorResSpinBox->setMinimum(1);
 
         gridLayout1->addWidget(boxHorResSpinBox, 0, 3, 1, 1);
@@ -433,6 +433,6 @@
         boxDepthResSpinBox = new QSpinBox(boxPage);
         boxDepthResSpinBox->setObjectName(QString::fromUtf8("boxDepthResSpinBox"));
+        boxDepthResSpinBox->setMinimum(1);
         boxDepthResSpinBox->setMaximum(128);
-        boxDepthResSpinBox->setMinimum(1);
 
         gridLayout1->addWidget(boxDepthResSpinBox, 2, 3, 1, 1);
@@ -475,5 +475,5 @@
         hboxLayout10->setSpacing(6);
 #endif
-        hboxLayout10->setMargin(4);
+        hboxLayout10->setContentsMargins(4, 4, 4, 4);
         hboxLayout10->setObjectName(QString::fromUtf8("hboxLayout10"));
         vboxLayout5 = new QVBoxLayout();
@@ -482,5 +482,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout5->setMargin(0);
+        vboxLayout5->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout5->setObjectName(QString::fromUtf8("vboxLayout5"));
@@ -490,5 +490,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout11->setMargin(0);
+        hboxLayout11->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout11->setObjectName(QString::fromUtf8("hboxLayout11"));
@@ -505,5 +505,5 @@
         modelBrowseButton = new QPushButton(modelPage);
         modelBrowseButton->setObjectName(QString::fromUtf8("modelBrowseButton"));
-        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -538,5 +538,5 @@
         hboxLayout12->setSpacing(6);
 #endif
-        hboxLayout12->setMargin(0);
+        hboxLayout12->setContentsMargins(0, 0, 0, 0);
         hboxLayout12->setObjectName(QString::fromUtf8("hboxLayout12"));
         frameCheckBox = new QCheckBox(QScreenWidget);
@@ -552,6 +552,6 @@
         frameLineWidthSpinBox = new QSpinBox(QScreenWidget);
         frameLineWidthSpinBox->setObjectName(QString::fromUtf8("frameLineWidthSpinBox"));
+        frameLineWidthSpinBox->setMinimum(1);
         frameLineWidthSpinBox->setMaximum(4);
-        frameLineWidthSpinBox->setMinimum(1);
 
         hboxLayout12->addWidget(frameLineWidthSpinBox);
@@ -617,5 +617,4 @@
         frameCheckBox->setText(QApplication::translate("QScreenWidget", "Wireframe", 0, QApplication::UnicodeUTF8));
         frameLineWidthLabel->setText(QApplication::translate("QScreenWidget", "Width", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QScreenWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qsetupdialog.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qsetupdialog.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qsetupdialog.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qsetupdialog.ui'
+** Form generated from reading UI file 'qsetupdialog.ui'
 **
-** Created: Mon 27. Apr 14:26:16 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:35:26 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -60,5 +60,5 @@
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         tabWidget = new QTabWidget(QSetupDialog);
@@ -70,5 +70,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(4);
+        hboxLayout1->setContentsMargins(4, 4, 4, 4);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout = new QVBoxLayout();
@@ -77,5 +77,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -89,5 +89,5 @@
         channelGroup = new QGroupBox(channelsTab);
         channelGroup->setObjectName(QString::fromUtf8("channelGroup"));
-        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(5));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(1);
@@ -98,5 +98,5 @@
         hboxLayout2->setSpacing(6);
 #endif
-        hboxLayout2->setMargin(4);
+        hboxLayout2->setContentsMargins(4, 4, 4, 4);
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         channel = new projection::QChannelWidget(channelGroup);
@@ -123,5 +123,5 @@
         vboxLayout1->setSpacing(6);
 #endif
-        vboxLayout1->setMargin(0);
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
         screen = new projection::QScreenWidget(screenTab);
@@ -141,5 +141,5 @@
         vboxLayout2->setSpacing(6);
 #endif
-        vboxLayout2->setMargin(0);
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
         scene = new projection::QSceneWidget(sceneTab);
@@ -171,5 +171,4 @@
         tabWidget->setTabText(tabWidget->indexOf(screenTab), QApplication::translate("QSetupDialog", "Screen", 0, QApplication::UnicodeUTF8));
         tabWidget->setTabText(tabWidget->indexOf(sceneTab), QApplication::translate("QSetupDialog", "Scene", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QSetupDialog);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qtransformmatrixwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qtransformmatrixwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/ui_qtransformmatrixwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'qtransformmatrixwidget.ui'
+** Form generated from reading UI file 'qtransformmatrixwidget.ui'
 **
-** Created: Mon 27. Apr 14:25:23 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:34:54 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -49,10 +49,10 @@
         if (QTransformMatrixWidget->objectName().isEmpty())
             QTransformMatrixWidget->setObjectName(QString::fromUtf8("QTransformMatrixWidget"));
-        QTransformMatrixWidget->resize(179, 78);
+        QTransformMatrixWidget->resize(203, 95);
         hboxLayout = new QHBoxLayout(QTransformMatrixWidget);
 #ifndef Q_OS_MAC
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         transformGroup = new QGroupBox(QTransformMatrixWidget);
@@ -62,5 +62,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         gridLayout = new QGridLayout();
@@ -68,5 +68,5 @@
         gridLayout->setSpacing(6);
 #endif
-        gridLayout->setMargin(4);
+        gridLayout->setContentsMargins(4, 4, 4, 4);
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         posZEdit = new QLineEdit(transformGroup);
@@ -154,5 +154,4 @@
         rotLabel->setText(QApplication::translate("QTransformMatrixWidget", "Rot", 0, QApplication::UnicodeUTF8));
         scaleLabel->setText(QApplication::translate("QTransformMatrixWidget", "Scale", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(QTransformMatrixWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultcubemapscenewidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultcubemapscenewidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultcubemapscenewidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DefaultCubemapSceneWidget</class>
- <widget class="QWidget" name="DefaultCubemapSceneWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DefaultCubemapSceneWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,226 +11,214 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Cubemap Properties</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="0" >
-       <layout class="QGridLayout" >
-        <property name="margin" >
+      <item row="0" column="0">
+       <layout class="QGridLayout">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>6</number>
         </property>
-        <item row="4" column="1" >
-         <widget class="QLineEdit" name="topFileNameEdit" />
-        </item>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="frontFileNameEdit" />
-        </item>
-        <item row="1" column="2" >
-         <widget class="QPushButton" name="backBrowseButton" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize" >
-           <size>
-            <width>23</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="backFileNameEdit" />
-        </item>
-        <item row="5" column="0" >
-         <widget class="QLabel" name="bottomLabel" >
-          <property name="text" >
+        <item row="4" column="1">
+         <widget class="QLineEdit" name="topFileNameEdit"/>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="frontFileNameEdit"/>
+        </item>
+        <item row="1" column="2">
+         <widget class="QPushButton" name="backBrowseButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>23</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="backFileNameEdit"/>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="bottomLabel">
+          <property name="text">
            <string>Bottom</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="2" >
-         <widget class="QPushButton" name="frontBrowseButton" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize" >
-           <size>
-            <width>23</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="leftLabel" >
-          <property name="text" >
+        <item row="0" column="2">
+         <widget class="QPushButton" name="frontBrowseButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>23</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="leftLabel">
+          <property name="text">
            <string>Left</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="2" >
-         <widget class="QPushButton" name="topBrowseButton" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize" >
-           <size>
-            <width>23</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1" >
-         <widget class="QLineEdit" name="bottomFileNameEdit" />
-        </item>
-        <item row="4" column="0" >
-         <widget class="QLabel" name="topLabel" >
-          <property name="text" >
+        <item row="4" column="2">
+         <widget class="QPushButton" name="topBrowseButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>23</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QLineEdit" name="bottomFileNameEdit"/>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="topLabel">
+          <property name="text">
            <string>Top</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="2" >
-         <widget class="QPushButton" name="rightBrowseButton" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize" >
-           <size>
-            <width>23</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="2" >
-         <widget class="QPushButton" name="bottomBrowseButton" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize" >
-           <size>
-            <width>23</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0" >
-         <widget class="QLabel" name="rightLabel" >
-          <property name="text" >
+        <item row="3" column="2">
+         <widget class="QPushButton" name="rightBrowseButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>23</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="2">
+         <widget class="QPushButton" name="bottomBrowseButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>23</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="rightLabel">
+          <property name="text">
            <string>Right</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="2" >
-         <widget class="QPushButton" name="leftBrowseButton" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize" >
-           <size>
-            <width>23</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="frontLabel" >
-          <property name="text" >
+        <item row="2" column="2">
+         <widget class="QPushButton" name="leftBrowseButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>23</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="frontLabel">
+          <property name="text">
            <string>Front</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1" >
-         <widget class="QLineEdit" name="rightFileNameEdit" />
-        </item>
-        <item row="2" column="1" >
-         <widget class="QLineEdit" name="leftFileNameEdit" />
-        </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="backLabel" >
-          <property name="text" >
+        <item row="3" column="1">
+         <widget class="QLineEdit" name="rightFileNameEdit"/>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="leftFileNameEdit"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="backLabel">
+          <property name="text">
            <string>Back</string>
           </property>
          </widget>
         </item>
-        <item row="6" column="1" >
+        <item row="6" column="1">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultemptyscenewidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultemptyscenewidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultemptyscenewidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DefaultEmptySceneWidget</class>
- <widget class="QWidget" name="DefaultEmptySceneWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DefaultEmptySceneWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,32 +11,32 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Empty Properties</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
+     <layout class="QVBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <widget class="QLabel" name="label" >
-        <property name="text" >
+       <widget class="QLabel" name="label">
+        <property name="text">
          <string>(nothing, sorry!)</string>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultmodelscenewidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultmodelscenewidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultmodelscenewidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DefaultModelSceneWidget</class>
- <widget class="QWidget" name="DefaultModelSceneWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DefaultModelSceneWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,45 +11,45 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Model Properties</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="0" >
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
+      <item row="0" column="0">
+       <layout class="QVBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="modelFileNameLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="modelFileNameLabel">
+            <property name="text">
              <string>File</string>
             </property>
@@ -56,17 +57,15 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="modelFileNameEdit" />
+           <widget class="QLineEdit" name="modelFileNameEdit"/>
           </item>
           <item>
-           <widget class="QPushButton" name="modelBrowseButton" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
+           <widget class="QPushButton" name="modelBrowseButton">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="maximumSize" >
+            <property name="maximumSize">
              <size>
               <width>23</width>
@@ -74,5 +73,5 @@
              </size>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>...</string>
             </property>
@@ -82,6 +81,6 @@
         </item>
         <item>
-         <widget class="QCheckBox" name="modelCullingCheckBox" >
-          <property name="text" >
+         <widget class="QCheckBox" name="modelCullingCheckBox">
+          <property name="text">
            <string>Back face culling</string>
           </property>
@@ -89,6 +88,6 @@
         </item>
         <item>
-         <widget class="QCheckBox" name="modelSmoothingCheckBox" >
-          <property name="text" >
+         <widget class="QCheckBox" name="modelSmoothingCheckBox">
+          <property name="text">
            <string>Smoothing</string>
           </property>
@@ -97,8 +96,8 @@
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultprojectorwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultprojectorwidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultprojectorwidget.ui	(revision 42)
@@ -1,54 +1,55 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DefaultProjectorWidget</class>
- <widget class="QWidget" name="DefaultProjectorWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DefaultProjectorWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>164</width>
+    <width>190</width>
     <height>141</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Projection</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="fovLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="fovLabel">
+            <property name="text">
              <string>FOV</string>
             </property>
@@ -56,9 +57,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="fovEdit" />
+           <widget class="QLineEdit" name="fovEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="aspectLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="aspectLabel">
+            <property name="text">
              <string>Aspect</string>
             </property>
@@ -66,19 +67,19 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="aspectRatioEdit" />
+           <widget class="QLineEdit" name="aspectRatioEdit"/>
           </item>
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="nearLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="nearLabel">
+            <property name="text">
              <string>Near</string>
             </property>
@@ -86,9 +87,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="nearEdit" />
+           <widget class="QLineEdit" name="nearEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="farLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="farLabel">
+            <property name="text">
              <string>Far</string>
             </property>
@@ -96,19 +97,19 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="farEdit" />
+           <widget class="QLineEdit" name="farEdit"/>
           </item>
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="offaxisLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisLabel">
+            <property name="text">
              <string>Off-axis </string>
             </property>
@@ -116,6 +117,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="offaxisXLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisXLabel">
+            <property name="text">
              <string>X</string>
             </property>
@@ -123,9 +124,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="offaxisXEdit" />
+           <widget class="QLineEdit" name="offaxisXEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="offaxisYLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisYLabel">
+            <property name="text">
              <string>Y</string>
             </property>
@@ -133,5 +134,5 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="offaxisYEdit" />
+           <widget class="QLineEdit" name="offaxisYEdit"/>
           </item>
          </layout>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultteapotscenewidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultteapotscenewidget.ui	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/defaultteapotscenewidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DefaultTeapotSceneWidget</class>
- <widget class="QWidget" name="DefaultTeapotSceneWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DefaultTeapotSceneWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,37 +11,37 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Teapot Properties</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
+     <layout class="QVBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <widget class="QCheckBox" name="wireframeCheckBox" >
-          <property name="text" >
+         <widget class="QCheckBox" name="wireframeCheckBox">
+          <property name="text">
            <string>Wireframe</string>
           </property>
@@ -48,9 +49,9 @@
         </item>
         <item>
-         <widget class="QLabel" name="widthLabel" >
-          <property name="text" >
+         <widget class="QLabel" name="widthLabel">
+          <property name="text">
            <string>Width</string>
           </property>
-          <property name="alignment" >
+          <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
@@ -58,15 +59,15 @@
         </item>
         <item>
-         <widget class="QSpinBox" name="widthSpinBox" >
-          <property name="suffix" >
+         <widget class="QSpinBox" name="widthSpinBox">
+          <property name="suffix">
            <string> px</string>
           </property>
-          <property name="maximum" >
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
            <number>10</number>
           </property>
-          <property name="minimum" >
-           <number>1</number>
-          </property>
-          <property name="value" >
+          <property name="value">
            <number>1</number>
           </property>
@@ -77,8 +78,8 @@
       <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
@@ -101,9 +102,9 @@
    <slot>selectAll()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>114</x>
      <y>44</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>171</x>
      <y>47</y>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/projdesigner_default.vcproj
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/projdesigner_default.vcproj	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/projdesigner_default.vcproj	(revision 42)
@@ -2,8 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="projdesigner_default"
 	ProjectGUID="{6169FA3C-3764-3D1A-80FC-D97551D6C7AC}"
+	RootNamespace="projdesigner_default"
 	Keyword="Qt4VSv1.0"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -45,5 +47,5 @@
 				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="4"
-				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include\QtOpenGL&quot;,&quot;$(QTDIR)\include\QtXml&quot;,&quot;$(QTDIR)\include&quot;,&quot;..\..&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;debug&quot;,&quot;.&quot;,&quot;.&quot;,$(QTDIR)\mkspecs\win32-msvc2005"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include\QtXml&quot;;&quot;$(QTDIR)\include&quot;;..\..;&quot;$(QTDIR)\include\ActiveQt&quot;;debug;.;&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot;;&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6&quot;"
 				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_STATICPLUGIN,QT_PLUGIN,QT_XML_LIB,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
 				GeneratePreprocessedFile="0"
@@ -123,5 +125,5 @@
 				Optimization="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include\QtOpenGL&quot;,&quot;$(QTDIR)\include\QtXml&quot;,&quot;$(QTDIR)\include&quot;,&quot;..\..&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;release&quot;,&quot;.&quot;,&quot;.&quot;,$(QTDIR)\mkspecs\win32-msvc2005"
+				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include\QtXml&quot;;&quot;$(QTDIR)\include&quot;;..\..;&quot;$(QTDIR)\include\ActiveQt&quot;;release;.;&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot;;&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6&quot;"
 				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_DEBUG,QT_STATICPLUGIN,QT_PLUGIN,QT_XML_LIB,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
 				GeneratePreprocessedFile="0"
@@ -246,5 +248,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultCubemapSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultCubemapSceneWidget.h -o debug\moc_DefaultCubemapSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultCubemapSceneWidget.h&quot; -o &quot;debug\moc_DefaultCubemapSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultCubemapSceneWidget.h"
 						Outputs="debug\moc_DefaultCubemapSceneWidget.cpp"
@@ -257,5 +259,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultCubemapSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultCubemapSceneWidget.h -o release\moc_DefaultCubemapSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultCubemapSceneWidget.h&quot; -o &quot;release\moc_DefaultCubemapSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultCubemapSceneWidget.h"
 						Outputs="release\moc_DefaultCubemapSceneWidget.cpp"
@@ -276,5 +278,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultEmptySceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultEmptySceneWidget.h -o debug\moc_DefaultEmptySceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultEmptySceneWidget.h&quot; -o &quot;debug\moc_DefaultEmptySceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultEmptySceneWidget.h"
 						Outputs="debug\moc_DefaultEmptySceneWidget.cpp"
@@ -287,5 +289,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultEmptySceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultEmptySceneWidget.h -o release\moc_DefaultEmptySceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultEmptySceneWidget.h&quot; -o &quot;release\moc_DefaultEmptySceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultEmptySceneWidget.h"
 						Outputs="release\moc_DefaultEmptySceneWidget.cpp"
@@ -306,5 +308,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultModelSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultModelSceneWidget.h -o debug\moc_DefaultModelSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultModelSceneWidget.h&quot; -o &quot;debug\moc_DefaultModelSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultModelSceneWidget.h"
 						Outputs="debug\moc_DefaultModelSceneWidget.cpp"
@@ -317,5 +319,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultModelSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultModelSceneWidget.h -o release\moc_DefaultModelSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultModelSceneWidget.h&quot; -o &quot;release\moc_DefaultModelSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultModelSceneWidget.h"
 						Outputs="release\moc_DefaultModelSceneWidget.cpp"
@@ -332,5 +334,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC defaultplugin.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 defaultplugin.h -o debug\moc_defaultplugin.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;defaultplugin.h&quot; -o &quot;debug\moc_defaultplugin.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;defaultplugin.h"
 						Outputs="debug\moc_defaultplugin.cpp"
@@ -343,5 +345,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC defaultplugin.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 defaultplugin.h -o release\moc_defaultplugin.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;defaultplugin.h&quot; -o &quot;release\moc_defaultplugin.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;defaultplugin.h"
 						Outputs="release\moc_defaultplugin.cpp"
@@ -362,5 +364,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultProjectorWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultProjectorWidget.h -o debug\moc_DefaultProjectorWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultProjectorWidget.h&quot; -o &quot;debug\moc_DefaultProjectorWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultProjectorWidget.h"
 						Outputs="debug\moc_DefaultProjectorWidget.cpp"
@@ -373,5 +375,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultProjectorWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultProjectorWidget.h -o release\moc_DefaultProjectorWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultProjectorWidget.h&quot; -o &quot;release\moc_DefaultProjectorWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultProjectorWidget.h"
 						Outputs="release\moc_DefaultProjectorWidget.cpp"
@@ -392,5 +394,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultTeapotSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultTeapotSceneWidget.h -o debug\moc_DefaultTeapotSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\debug\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultTeapotSceneWidget.h&quot; -o &quot;debug\moc_DefaultTeapotSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultTeapotSceneWidget.h"
 						Outputs="debug\moc_DefaultTeapotSceneWidget.cpp"
@@ -403,5 +405,5 @@
 						Name="VCCustomBuildTool"
 						Description="MOC DefaultTeapotSceneWidget.h"
-						CommandLine="$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include\QtOpenGL&quot; -I&quot;$(QTDIR)\include\QtXml&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;..\..&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 DefaultTeapotSceneWidget.h -o release\moc_DefaultTeapotSceneWidget.cpp&#x0D;&#x0A;"
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_STATICPLUGIN -DQT_PLUGIN -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DNDEBUG  -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\QtOpenGL\.&quot; -I&quot;$(QTDIR)\include\QtXml\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\..\..\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;.\release\.&quot; -I&quot;.\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; -I&quot;D:\OpenSceneGraph\3rdParty_VC9sp1_x86_x64\include\glut-3.7.6\.&quot; &quot;DefaultTeapotSceneWidget.h&quot; -o &quot;release\moc_DefaultTeapotSceneWidget.cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QTDIR)\bin\moc.exe;DefaultTeapotSceneWidget.h"
 						Outputs="release\moc_DefaultTeapotSceneWidget.cpp"
@@ -727,4 +729,8 @@
 			Value="4.5.1"
 		/>
+		<Global
+			Name="QtVersion Win32"
+			Value="$(DefaultQtVersion)"
+		/>
 	</Globals>
 </VisualStudioProject>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultcubemapscenewidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultcubemapscenewidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultcubemapscenewidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'defaultcubemapscenewidget.ui'
+** Form generated from reading UI file 'defaultcubemapscenewidget.ui'
 **
-** Created: Mon 27. Apr 14:23:54 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:22:27 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -62,5 +62,5 @@
         gridLayout->setSpacing(6);
 #endif
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         projectionGroup = new QGroupBox(DefaultCubemapSceneWidget);
@@ -71,5 +71,5 @@
 #endif
 #ifndef Q_OS_MAC
-        gridLayout1->setMargin(9);
+        gridLayout1->setContentsMargins(9, 9, 9, 9);
 #endif
         gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
@@ -79,5 +79,5 @@
 #endif
 #ifndef Q_OS_MAC
-        gridLayout2->setMargin(0);
+        gridLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
@@ -94,5 +94,5 @@
         backBrowseButton = new QPushButton(projectionGroup);
         backBrowseButton->setObjectName(QString::fromUtf8("backBrowseButton"));
-        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -225,5 +225,4 @@
         frontLabel->setText(QApplication::translate("DefaultCubemapSceneWidget", "Front", 0, QApplication::UnicodeUTF8));
         backLabel->setText(QApplication::translate("DefaultCubemapSceneWidget", "Back", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DefaultCubemapSceneWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultemptyscenewidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultemptyscenewidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultemptyscenewidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'defaultemptyscenewidget.ui'
+** Form generated from reading UI file 'defaultemptyscenewidget.ui'
 **
-** Created: Mon 27. Apr 14:23:52 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:22:26 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -40,5 +40,5 @@
         vboxLayout->setSpacing(6);
 #endif
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         projectionGroup = new QGroupBox(DefaultEmptySceneWidget);
@@ -49,5 +49,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(9);
+        vboxLayout1->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
@@ -72,5 +72,4 @@
         projectionGroup->setTitle(QApplication::translate("DefaultEmptySceneWidget", "Empty Properties", 0, QApplication::UnicodeUTF8));
         label->setText(QApplication::translate("DefaultEmptySceneWidget", "(nothing, sorry!)", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DefaultEmptySceneWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultmodelscenewidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultmodelscenewidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultmodelscenewidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'defaultmodelscenewidget.ui'
+** Form generated from reading UI file 'defaultmodelscenewidget.ui'
 **
-** Created: Mon 27. Apr 14:23:53 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:22:26 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -51,5 +51,5 @@
         gridLayout = new QGridLayout(DefaultModelSceneWidget);
         gridLayout->setSpacing(0);
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         projectionGroup = new QGroupBox(DefaultModelSceneWidget);
@@ -60,5 +60,5 @@
 #endif
 #ifndef Q_OS_MAC
-        gridLayout1->setMargin(9);
+        gridLayout1->setContentsMargins(9, 9, 9, 9);
 #endif
         gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
@@ -68,5 +68,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(0);
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -76,5 +76,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
@@ -91,5 +91,5 @@
         modelBrowseButton = new QPushButton(projectionGroup);
         modelBrowseButton->setObjectName(QString::fromUtf8("modelBrowseButton"));
-        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -137,5 +137,4 @@
         modelCullingCheckBox->setText(QApplication::translate("DefaultModelSceneWidget", "Back face culling", 0, QApplication::UnicodeUTF8));
         modelSmoothingCheckBox->setText(QApplication::translate("DefaultModelSceneWidget", "Smoothing", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DefaultModelSceneWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultprojectorwidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultprojectorwidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultprojectorwidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'defaultprojectorwidget.ui'
+** Form generated from reading UI file 'defaultprojectorwidget.ui'
 **
-** Created: Mon 27. Apr 14:23:54 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:22:26 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -53,10 +53,10 @@
         if (DefaultProjectorWidget->objectName().isEmpty())
             DefaultProjectorWidget->setObjectName(QString::fromUtf8("DefaultProjectorWidget"));
-        DefaultProjectorWidget->resize(164, 141);
+        DefaultProjectorWidget->resize(190, 141);
         hboxLayout = new QHBoxLayout(DefaultProjectorWidget);
 #ifndef Q_OS_MAC
         hboxLayout->setSpacing(6);
 #endif
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         projectionGroup = new QGroupBox(DefaultProjectorWidget);
@@ -66,5 +66,5 @@
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         vboxLayout = new QVBoxLayout();
@@ -72,5 +72,5 @@
         vboxLayout->setSpacing(6);
 #endif
-        vboxLayout->setMargin(4);
+        vboxLayout->setContentsMargins(4, 4, 4, 4);
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         hboxLayout2 = new QHBoxLayout();
@@ -79,5 +79,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
@@ -109,5 +109,5 @@
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(0);
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         nearLabel = new QLabel(projectionGroup);
@@ -138,5 +138,5 @@
         hboxLayout4->setSpacing(6);
 #endif
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
         offaxisLabel = new QLabel(projectionGroup);
@@ -194,5 +194,4 @@
         offaxisXLabel->setText(QApplication::translate("DefaultProjectorWidget", "X", 0, QApplication::UnicodeUTF8));
         offaxisYLabel->setText(QApplication::translate("DefaultProjectorWidget", "Y", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DefaultProjectorWidget);
     } // retranslateUi
 
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultteapotscenewidget.h
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultteapotscenewidget.h	(revision 20)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesignerplugins/defaultplugin/ui_defaultteapotscenewidget.h	(revision 42)
@@ -1,9 +1,9 @@
 /********************************************************************************
-** Form generated from reading ui file 'defaultteapotscenewidget.ui'
+** Form generated from reading UI file 'defaultteapotscenewidget.ui'
 **
-** Created: Mon 27. Apr 14:23:55 2009
-**      by: Qt User Interface Compiler version 4.5.1
+** Created: Wed 19. May 08:22:26 2010
+**      by: Qt User Interface Compiler version 4.6.2
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
@@ -47,5 +47,5 @@
         gridLayout = new QGridLayout(DefaultTeapotSceneWidget);
         gridLayout->setSpacing(0);
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         projectionGroup = new QGroupBox(DefaultTeapotSceneWidget);
@@ -56,5 +56,5 @@
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(9);
+        vboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
@@ -64,5 +64,5 @@
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
@@ -80,6 +80,6 @@
         widthSpinBox = new QSpinBox(projectionGroup);
         widthSpinBox->setObjectName(QString::fromUtf8("widthSpinBox"));
+        widthSpinBox->setMinimum(1);
         widthSpinBox->setMaximum(10);
-        widthSpinBox->setMinimum(1);
         widthSpinBox->setValue(1);
 
@@ -110,5 +110,4 @@
         widthLabel->setText(QApplication::translate("DefaultTeapotSceneWidget", "Width", 0, QApplication::UnicodeUTF8));
         widthSpinBox->setSuffix(QApplication::translate("DefaultTeapotSceneWidget", " px", 0, QApplication::UnicodeUTF8));
-        Q_UNUSED(DefaultTeapotSceneWidget);
     } // retranslateUi
 
