Synchronized with trunk

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1087 4e206d99-4929-0410-ac5d-dfc041789085

samples/build/vc2005/opengl.vcproj

@@ -147,7 +147,7 @@
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"

samples/qt/QSFMLCanvas.cpp

@@ -20,6 +20,7 @@ myInitialized (false)
 {
     // Setup some states to allow direct rendering into the widget
     setAttribute(Qt::WA_PaintOnScreen);
+    setAttribute(Qt::WA_OpaquePaintEvent);
     setAttribute(Qt::WA_NoSystemBackground);
 
     // Set strong focus to enable keyboard events to be received
@@ -63,6 +64,15 @@ void QSFMLCanvas::OnUpdate()
 }
 
 
+////////////////////////////////////////////////////////////
+/// Return the paint engine used by the widget to draw itself
+////////////////////////////////////////////////////////////
+QPaintEngine* QSFMLCanvas::paintEngine() const
+{
+    return 0;
+}
+
+
 ////////////////////////////////////////////////////////////
 /// Called when the widget is shown ;
 /// we use it to initialize our SFML window

samples/qt/QSFMLCanvas.hpp

@@ -50,6 +50,12 @@ private :
     ////////////////////////////////////////////////////////////
     virtual void OnUpdate();
 
+    ////////////////////////////////////////////////////////////
+    /// Return the paint engine used by the widget to draw itself
+    ///
+    ////////////////////////////////////////////////////////////
+    virtual QPaintEngine* paintEngine() const;
+
     ////////////////////////////////////////////////////////////
     /// Called when the widget is shown ;
     /// we use it to initialize our SFML window

samples/sockets/Sockets.cpp

@@ -3,6 +3,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <iostream>
+#include <cstdlib>
 
 
 ////////////////////////////////////////////////////////////

samples/voip/VoIP.cpp

@@ -3,7 +3,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <iomanip>
-#include <iostream>
+#include <iostream>
+#include <cstdlib>
 
 
 ////////////////////////////////////////////////////////////