Fix detection of g++ in src.pro

Fix ftbfs on windows

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@291 b624d157-de02-0410-bad0-e51aec6abb33

src/Kdb3Database.cpp

@@ -1432,17 +1432,15 @@ bool Kdb3Database::save(){
 		aes.key256(FinalKey);
 		aes.cbc_encrypt((unsigned char*)buffer+DB_HEADER_SIZE,(unsigned char*)buffer+DB_HEADER_SIZE,EncryptedPartSize,(unsigned char*)EncryptionIV);
 	}
-	else{
+	else{ // Algorithm == Twofish_Cipher
-		if(Algorithm == Twofish_Cipher){
+		CTwofish twofish;
-			CTwofish twofish;
+		if(twofish.init(FinalKey, 32, EncryptionIV) == false){
-			if(twofish.init(FinalKey, 32, EncryptionIV) == false){
+			UNEXP_ERROR
-				UNEXP_ERROR
+			delete [] buffer;
-				delete [] buffer;
+			return false;
-				return false;
-			}
-			EncryptedPartSize = (unsigned long)twofish.padEncrypt((quint8*)buffer+DB_HEADER_SIZE,
-				pos - DB_HEADER_SIZE,(quint8*)buffer+DB_HEADER_SIZE);
 		}
+		EncryptedPartSize = (unsigned long)twofish.padEncrypt((quint8*)buffer+DB_HEADER_SIZE,
+			pos - DB_HEADER_SIZE,(quint8*)buffer+DB_HEADER_SIZE);
 	}
 	if((EncryptedPartSize > (0xFFFFFFE - 202)) || (!EncryptedPartSize && Groups.size())){
 		UNEXP_ERROR

src/lib/tools.cpp

@@ -26,6 +26,7 @@
 	#include <sys/mman.h>
 	#include <unistd.h>
 #elif defined(Q_WS_WIN)
+	#include <QLibrary>
 	#include <windows.h>
 	#include <io.h>
 #endif

src/src.pro

@@ -2,7 +2,7 @@
 CONFIG = qt uic resources thread stl warn_on
 QT += xml
 
-contains(QMAKE_CXX, g++) : QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
+*-g++ : QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
 
 DEPENDPATH += crypto dialogs export forms import lib translations res
 INCLUDEPATH += . lib crypto plugins/interfaces export import dialogs