r19809 by craig - #12687: Avoid showing progress bar on OSX with Qt 5.3+ for barcode placement

[scribus-commit]

Author: craig
Date: Wed Feb 11 16:06:32 2015
New Revision: 19809

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19809
Log:
#12687: Avoid showing progress bar on OSX with Qt 5.3+ for barcode placement

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/plugins/import/ps/importps.cpp

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19809&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Wed Feb 11 16:06:32 2015
@@ -170,6 +170,11 @@
 
 bool PdfPlug::import(QString fNameIn, const TransactionSettings& trSettings, int flags, bool showProgress)
 {
+#ifdef Q_OS_OSX
+	#if QT_VERSION >= 0x050300
+		showProgress = false;
+	#endif
+#endif
 	QString fName = fNameIn;
 	bool success = false;
 	interactive = (flags & LoadSavePlugin::lfInteractive);

Modified: trunk/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19809&path=/trunk/Scribus/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ps/importps.cpp Wed Feb 11 16:06:32 2015
@@ -65,6 +65,12 @@
 
 bool EPSPlug::import(QString fName, const TransactionSettings &trSettings, int flags, bool showProgress)
 {
+#ifdef Q_OS_OSX
+	#if QT_VERSION >= 0x050300
+		showProgress = false;
+	#endif
+#endif
+
 	bool success = false;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
 	cancel = false;