r17115 by craig - Only show console font output on OSX if the command line option is given

scribus-commit scribus-commit at lists.scribus.net
Thu Dec 22 22:15:23 UTC 2011


Author: craig
Date: Thu Dec 22 22:15:23 2011
New Revision: 17115

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17115
Log:
Only show console font output on OSX if the command line option is given

Modified:
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17115&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Thu Dec 22 22:15:23 2011
@@ -159,11 +159,11 @@
 	prefsManager->setup();
 	//CB #4428 Get fonts before prefs are set to default
 	bool haveFonts=false;
-#ifdef Q_OS_MAC
-	haveFonts=ScCore->initFonts(true);
-#else
+//#ifdef Q_OS_MAC
+//	haveFonts=ScCore->initFonts(true);
+//#else
 	haveFonts=ScCore->initFonts(showFontInfo);
-#endif
+//#endif
 	if (!haveFonts)
 		return 1;
 	prefsManager->initDefaults();




More information about the scribus-commit mailing list