From 31458376296f58c03f5c81157998c8e532dc110f Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 13 Dec 2010 17:54:27 +0000
Subject: [PATCH] Renamed osgviewerQtContext to osgviewerQt, and removed
 deprecated examples from CMakeLists.txt

---
 examples/CMakeLists.txt                       | 19 +++++--------------
 .../CMakeLists.txt                            |  0
 .../osgviewerQtContext.cpp                    |  0
 3 files changed, 5 insertions(+), 14 deletions(-)
 rename examples/{osgviewerQtContext => osgviewerQt}/CMakeLists.txt (100%)
 rename examples/{osgviewerQtContext => osgviewerQt}/osgviewerQtContext.cpp (100%)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index cadf3f7d5..f10decf89 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -132,7 +132,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osganimationsolid)
     ADD_SUBDIRECTORY(osganimationviewer)
     ADD_SUBDIRECTORY(osganimationeasemotion)
-    ADD_SUBDIRECTORY(osgbrowser)
     ADD_SUBDIRECTORY(osgwidgetaddremove)
     ADD_SUBDIRECTORY(osgwidgetbox)
     ADD_SUBDIRECTORY(osgwidgetcanvas)
@@ -193,19 +192,14 @@ IF(DYNAMIC_OPENSCENEGRAPH)
         OPTION(BUILD_QT_EXAMPLES "Enable the build of the examples that depend on Qt" ON)
 
         IF (BUILD_QT_EXAMPLES AND QT_QTOPENGL_LIBRARY)
-            ADD_SUBDIRECTORY(osgviewerQT)
-            ADD_SUBDIRECTORY(osgviewerQtContext)
+            ADD_SUBDIRECTORY(osgviewerQt)
         ENDIF()
 
-        IF (BUILD_QT_EXAMPLES AND QT4_FOUND)
-            ADD_SUBDIRECTORY(osgviewerQtWidget)
-
-            IF (QT_QTWEBKIT_FOUND)
-                ADD_SUBDIRECTORY(osgQtWidgets)
-                ADD_SUBDIRECTORY(osgQtBrowser)
-            ENDIF()
-
+        IF (BUILD_QT_EXAMPLES AND QT4_FOUND AND QT_QTWEBKIT_FOUND)
+            ADD_SUBDIRECTORY(osgQtWidgets)
+            ADD_SUBDIRECTORY(osgQtBrowser)
         ENDIF()
+
     ENDIF()
 
     IF   (FLTK_FOUND)
@@ -234,9 +228,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
         ADD_SUBDIRECTORY(osgvnc)
     ENDIF(LIBVNCSERVER_FOUND)
 
-
-    #ADD_SUBDIRECTORY(osgcegui)
-
     #to add subject to find socket#ADD_SUBDIRECTORY(osgcluster)
 
 ELSE(DYNAMIC_OPENSCENEGRAPH)
diff --git a/examples/osgviewerQtContext/CMakeLists.txt b/examples/osgviewerQt/CMakeLists.txt
similarity index 100%
rename from examples/osgviewerQtContext/CMakeLists.txt
rename to examples/osgviewerQt/CMakeLists.txt
diff --git a/examples/osgviewerQtContext/osgviewerQtContext.cpp b/examples/osgviewerQt/osgviewerQtContext.cpp
similarity index 100%
rename from examples/osgviewerQtContext/osgviewerQtContext.cpp
rename to examples/osgviewerQt/osgviewerQtContext.cpp