From f071a68405290032144989c8ac8532ebe3efebe3 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Tue, 31 May 2011 16:54:52 +0000
Subject: [PATCH] Fix or silence warnings in pythonqt.

---
 3rdparty/pythonqt/CMakeLists.txt             | 1 +
 3rdparty/pythonqt/src/PythonQt.h             | 2 +-
 3rdparty/pythonqt/src/PythonQtClassInfo.h    | 2 +-
 3rdparty/pythonqt/src/PythonQtMethodInfo.cpp | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/pythonqt/CMakeLists.txt b/3rdparty/pythonqt/CMakeLists.txt
index 9760732ed..229bed57a 100644
--- a/3rdparty/pythonqt/CMakeLists.txt
+++ b/3rdparty/pythonqt/CMakeLists.txt
@@ -81,6 +81,7 @@ add_library(pythonqt ${TYPE}
   ${SOURCES}
   ${MOC}
 )
+set_target_properties(pythonqt PROPERTIES COMPILE_FLAGS "-Wno-write-strings -Wno-format-nonliteral -Wno-format-security -Wno-builtin-macro-redefined")
 
 target_link_libraries(pythonqt
   ${PYTHON_LIBRARIES}
diff --git a/3rdparty/pythonqt/src/PythonQt.h b/3rdparty/pythonqt/src/PythonQt.h
index 9a7c29fee..0e2571770 100644
--- a/3rdparty/pythonqt/src/PythonQt.h
+++ b/3rdparty/pythonqt/src/PythonQt.h
@@ -42,8 +42,8 @@
 */
 //----------------------------------------------------------------------------------
 
-#include "PythonQtSystem.h"
 #include "PythonQtInstanceWrapper.h"
+#include "PythonQtSystem.h"
 #include "PythonQtClassWrapper.h"
 #include "PythonQtSlot.h"
 #include "PythonQtObjectPtr.h"
diff --git a/3rdparty/pythonqt/src/PythonQtClassInfo.h b/3rdparty/pythonqt/src/PythonQtClassInfo.h
index 463b07e67..835412355 100644
--- a/3rdparty/pythonqt/src/PythonQtClassInfo.h
+++ b/3rdparty/pythonqt/src/PythonQtClassInfo.h
@@ -33,12 +33,12 @@
  *
  */
 
+#include "PythonQt.h"
 #include <QMetaObject>
 #include <QMetaMethod>
 #include <QHash>
 #include <QByteArray>
 #include <QList>
-#include "PythonQt.h"
 
 class PythonQtSlotInfo;
 
diff --git a/3rdparty/pythonqt/src/PythonQtMethodInfo.cpp b/3rdparty/pythonqt/src/PythonQtMethodInfo.cpp
index 740e4ab37..aee37deea 100644
--- a/3rdparty/pythonqt/src/PythonQtMethodInfo.cpp
+++ b/3rdparty/pythonqt/src/PythonQtMethodInfo.cpp
@@ -39,8 +39,8 @@
 */
 //----------------------------------------------------------------------------------
 
-#include "PythonQtMethodInfo.h"
 #include "PythonQtClassInfo.h"
+#include "PythonQtMethodInfo.h"
 #include <iostream>
 
 QHash<QByteArray, PythonQtMethodInfo*> PythonQtMethodInfo::_cachedSignatures;
@@ -350,4 +350,3 @@ QByteArray PythonQtSlotInfo::slotName()
   sig = sig.left(idx);
   return sig;
 }
-