From 2c210b8ff91738c805059375996b4c885b95c51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Tue, 9 Mar 2010 11:10:34 +0100
Subject: [PATCH] dmake,qmake: temporarily removed -Wsign-conversion

---
 Makefile        | 2 +-
 cli/cli.pro     | 2 +-
 tools/dmake.cpp | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7fcfd1c7b..99963120d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS=-Wall -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wsign-conversion -Wlogical-op -g -D_GLIBCXX_DEBUG
+CXXFLAGS=-Wall -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wlogical-op -g -D_GLIBCXX_DEBUG
 CXX=g++
 BIN=${DESTDIR}/usr/bin
 
diff --git a/cli/cli.pro b/cli/cli.pro
index 3e3da246d..0f63308c1 100644
--- a/cli/cli.pro
+++ b/cli/cli.pro
@@ -27,7 +27,7 @@ win32 {
 
 # Add more strict compiling flags for GCC
 contains(QMAKE_CXX, g++) {
-    QMAKE_CXXFLAGS_WARN_ON += -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wsign-conversion -Wlogical-op
+    QMAKE_CXXFLAGS_WARN_ON += -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wlogical-op
 
     CONFIG(debug, debug|release) {
         # checked STL
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 5ed404f17..66c3e2230 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -141,7 +141,8 @@ int main(int argc, char **argv)
     std::ofstream fout("Makefile");
 
     // Makefile settings..
-    fout << "CXXFLAGS=-Wall -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wsign-conversion -Wlogical-op ";
+    // TODO: add more compiler warnings. For example -Wsign-conversion
+    fout << "CXXFLAGS=-Wall -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wlogical-op ";
     fout << (release ? "-O2 -DNDEBUG" : "-g -D_GLIBCXX_DEBUG") << "\n";
     fout << "CXX=g++\n";
     fout << "BIN=${DESTDIR}/usr/bin\n\n";