rpms/ipe/FC-5 ipe_6.0pre26-qmake-defines.patch,NONE,1.1

[Laurent Rineau (rineau)]

Author: rineau

Update of /cvs/extras/rpms/ipe/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4969/FC-5

Added Files:
	ipe_6.0pre26-qmake-defines.patch 
Log Message:
forgot to commit that one!

ipe_6.0pre26-qmake-defines.patch:

--- NEW FILE ipe_6.0pre26-qmake-defines.patch ---
--- ipe-6.0pre26/src/ipemodel/ipeprefs.cpp.defines.bak	2006-08-31 19:15:38.000000000 +0200
+++ ipe-6.0pre26/src/ipemodel/ipeprefs.cpp	2006-08-31 19:19:58.000000000 +0200
@@ -108,6 +108,9 @@
   return This;
 }
 
+#define IPE_QUOTE_(x) #x
+#define IPE_QUOTE(x) IPE_QUOTE_(x)
+
 //! Constructor sets up preferences.
 /*! Preferences are read from the preferences file
   (<tt>$HOME/.iperc</tt> on Unix, <tt>$HOME/_ipecfg</tt> on Windows).
@@ -158,12 +161,12 @@
   if (!ipedir.exists())
     home.mkdir(QLatin1String(".ipe"));
   iLatexDir = ipedir.filePath(QLatin1String("latexrun"));
-  iDocDir = QLatin1String(IPEDOCDIR);
-  iFontmap = QLatin1String(IPEFONTMAP);
-  iStdKeysFileName = QLatin1String(IPEKEYSFILE);
-  iBrowser = QLatin1String(IPEBROWSER);
-  iIpeletPath.append(QLatin1String(IPELETPATH));
-  iLangDir = QLatin1String(IPELANGDIR);
+  iDocDir = QLatin1String(IPE_QUOTE(IPEDOCDIR));
+  iFontmap = QLatin1String(IPE_QUOTE(IPEFONTMAP));
+  iStdKeysFileName = QLatin1String(IPE_QUOTE(IPEKEYSFILE));
+  iBrowser = QLatin1String(IPE_QUOTE(IPEBROWSER));
+  iIpeletPath.append(QLatin1String(IPE_QUOTE(IPELETPATH)));
+  iLangDir = QLatin1String(IPE_QUOTE(IPELANGDIR));
 #endif
   iPdfLatex = QLatin1String("pdflatex");
   const char *p;
--- ipe-6.0pre26/src/ipemodel/ipemodel.pro.defines.bak	2006-08-31 19:13:53.000000000 +0200
+++ ipe-6.0pre26/src/ipemodel/ipemodel.pro	2006-08-31 19:14:29.000000000 +0200
@@ -23,12 +23,12 @@
 SOURCES         += ipeprefs.cpp
 SOURCES		+= ipeq.cpp
 # --------------------------------------------------------------------
-unix:DEFINES += IPEDOCDIR=\"$$IPEDOCDIR\"
-unix:DEFINES += IPELETPATH=\"$$IPELETPATH\"
-unix:DEFINES += IPEFONTMAP=\"$$IPEFONTMAP\"
-unix:DEFINES += IPEKEYSFILE=\"$$IPEKEYSFILE\"
-unix:DEFINES += IPEBROWSER=\"$$IPEBROWSER\"
-unix:DEFINES += IPELANGDIR=\"$$IPELANGDIR\"
+unix:DEFINES += IPEDOCDIR=$$IPEDOCDIR
+unix:DEFINES += IPELETPATH=$$IPELETPATH
+unix:DEFINES += IPEFONTMAP=$$IPEFONTMAP
+unix:DEFINES += IPEKEYSFILE=$$IPEKEYSFILE
+unix:DEFINES += IPEBROWSER=$$IPEBROWSER
+unix:DEFINES += IPELANGDIR=$$IPELANGDIR
 # --------------------------------------------------------------------
 unix:target.path = $${IPELIBDIR}
 unix:INSTALLS   += target