r21529 by craig - #9808: Switch directory finding for data dirs to QStandardPaths, thereby implementing XDG standards on Linux. Clean up. Bump Qt minimum to 5.5, fourth part

[scribus-commit]

Author: craig
Date: Mon Nov 21 00:11:11 2016
New Revision: 21529

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21529
Log:
#9808: Switch directory finding for data dirs to QStandardPaths, thereby implementing XDG standards on Linux. Clean up. Bump Qt minimum to 5.5, fourth part

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21529&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Mon Nov 21 00:11:11 2016
@@ -734,6 +734,9 @@
 
 bool PrefsManager::copyOldAppConfigAndData()
 {
+	if (QFile::exists(m_prefsLocation+"scribus150.rc") && QFile::exists(m_prefsLocation+"prefs150.xml"))
+		return false;
+
 	//Move to using the ScPaths default prefs location/scribus.* from ~/.scribus.*
 	QString oldPR = QDir::toNativeSeparators(QDir::homePath()+"/.scribus.rc");
 	QFileInfo oldPi = QFileInfo(oldPR);