Merge branch 'master' into feature/osgQOpenGL

Author: mathieu

.gitignore

@@ -1 +1,80 @@
-/build
+doc/all_Doxyfile
+doc/auto_Doxyfile
+doc/core_Doxyfile
+doc/openscenegraph.doxyfile
+doc/openthreads.doxyfile
+
+doc/OpenSceneGraphReferenceDocs/
+doc/OpenThreadsReferenceDocs/
+
+cmake_uninstall.cmake
+
+include/OpenThreads/Config
+include/OpenThreads/Version
+include/osg/Config
+include/osg/GL
+include/osg/Version
+include/osgQt/Version
+src/osgQt/__
+
+lib/
+bin/
+
+*.pc
+*.conf
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Platform Specifics - auto generated files
+PlatformSpecifics/Windows/*.rc
+
+# Visual studio - project files
+*.sln
+*.suo
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+
+# Visual Studio - Build Results
+[Dd]ebug/
+[Rr]elease/
+[Mm]in[Ss]ize[Rr]el/
+[Rr]el[Ww]ith[Dd]eb[Ii]nfo/
+
+# Visual Studio - Browsing Database File
+*.sdf
+*.opensdf

CMakeLists.txt

@@ -854,7 +854,7 @@ IF(CMAKE_CPACK_COMMAND)
 ENDIF()
 
 # Generate pkg-config configuration files
-SET ( PKGCONFIG_MODULE_NAME osgQt )
+    SET ( PKGCONFIG_MODULE_NAME osgQt )
 
 CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph-osgQt.pc.in
   ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph-${PKGCONFIG_MODULE_NAME}.pc

examples/osgqfont/osgqfont.cpp

@@ -503,6 +503,10 @@ class MainWindow : public QWidget {
         camera->setGraphicsContext(graphicsWindow);
         camera->setViewport(new osg::Viewport(0, 0, width(), height()));
 
+        // set the draw and read buffers up for a double buffered window with rendering going to back buffer
+        camera->setDrawBuffer(GL_BACK);
+        camera->setReadBuffer(GL_BACK);
+
         startTimer(10);
     }
 

examples/osgviewerQt/osgviewerQt.cpp

@@ -39,7 +39,7 @@
 #include <iostream>
 
 
-int main(int argc, char** argv)
+int main( int argc, char** argv )
 {