From fc2d6e07b791218ba3d5a2a55beee79fd9de1fe5 Mon Sep 17 00:00:00 2001
From: tarek_saidi <tarek_saidi@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Thu, 13 Mar 2008 21:36:33 +0000
Subject: [PATCH] fixed possible compilation problem (bug #1910619), fixed
 compilation error when building univeral binaries

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@185 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/KpxConfig.cpp              | 5 +++--
 src/dialogs/PasswordGenDlg.cpp | 3 ++-
 src/src.pro                    | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/KpxConfig.cpp b/src/KpxConfig.cpp
index 8b7dfab..5379064 100644
--- a/src/KpxConfig.cpp
+++ b/src/KpxConfig.cpp
@@ -222,8 +222,9 @@ QRect KpxConfig::dialogGeometry(const QWidget* widget){
 		if (size.width() < minSize.width() || size.height() < minSize.height())
 			size = minSize;
 	}
-	
-	QRect rect(QPoint(), size);
+
+	QRect rect;
+	rect=QRect(QPoint(), size);
 	rect.moveCenter( widget->parentWidget()->window()->geometry().center() );
 	return rect;
 }
diff --git a/src/dialogs/PasswordGenDlg.cpp b/src/dialogs/PasswordGenDlg.cpp
index 7234d06..c71ecfa 100644
--- a/src/dialogs/PasswordGenDlg.cpp
+++ b/src/dialogs/PasswordGenDlg.cpp
@@ -247,7 +247,8 @@ void CGenPwDialog::estimateQuality(){
 		num=Edit_chars->text().length();
 
 	float bits=0;
-	if(num)bits=log(num)/log(2);
+	if(num)
+		bits=log((float)num)/log(2.0f);
 	bits=bits*((float)Spin_Num->value());
 	Progress_Quali->setFormat(tr("%1 Bits").arg((int)bits));
 	Progress_Quali->update();
diff --git a/src/src.pro b/src/src.pro
index 806db3c..272b83d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -78,7 +78,9 @@ macx {
     CONFIG += app_bundle
     isEqual(ARCH,UNIVERSAL) {
         CONFIG += x86 ppc
+        # lipo cannot handle precompiled headers (yet)
         CONFIG -= precompile_header
+        QMAKE_CXXFLAGS += -include keepassx.h
 	}
     isEqual(ARCH,INTEL): CONFIG += x86
     isEqual(ARCH,PPC): CONFIG += ppc