Author: jghali
Date: Sat Oct 19 00:17:47 2013
New Revision: 18562
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18562
Log:
#11794: QFSFileEngine::open: No file name specified warning in terminal
Modified:
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18562&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Oct 19 00:17:47 2013
@@ -50,7 +50,7 @@
#include <QMouseEvent>
#include <QPixmap>
#include <QProgressBar>
-#include <QQuickView>
+//#include <QQuickView>
#include <QRegExp>
#include <QStyleFactory>
#include <QTableWidget>
@@ -442,7 +442,8 @@
Cpfad =
csm.userPaletteFileFromName(prefsManager->appPrefs.colorPrefs.DColorSet);
else
Cpfad =
csm.paletteFileFromName(prefsManager->appPrefs.colorPrefs.DColorSet);
- csm.loadPalette(Cpfad, m_doc,
prefsManager->appPrefs.colorPrefs.DColors,
prefsManager->appPrefs.defaultGradients,
prefsManager->appPrefs.defaultPatterns, false);
+ if (!Cpfad.isEmpty())
+ csm.loadPalette(Cpfad, m_doc,
prefsManager->appPrefs.colorPrefs.DColors,
prefsManager->appPrefs.defaultGradients,
prefsManager->appPrefs.defaultPatterns, false);
}
}
actionManager->setStartupActionsEnabled(false);
@@ -2061,7 +2062,8 @@
Cpfad =
csm.userPaletteFileFromName(prefsManager->appPrefs.colorPrefs.DColorSet);
else
Cpfad =
csm.paletteFileFromName(prefsManager->appPrefs.colorPrefs.DColorSet);
- csm.loadPalette(Cpfad, doc, colorList, gradientsList,
patternsList, false);
+ if (!Cpfad.isEmpty())
+ csm.loadPalette(Cpfad, doc, colorList,
gradientsList, patternsList, false);
doc->PageColors = colorList;
doc->docGradients = gradientsList;
doc->docPatterns = patternsList;
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
