Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 13438 → Rev 13439

/trunk/Scribus/scribus/masterpagepalette.cpp
32,7 → 32,11
#include "util_icon.h"
 
MasterPagesPalette::MasterPagesPalette( QWidget* parent, ScribusDoc *pCurrentDoc, ScribusView *pCurrentView, QString masterPageName)
: QDialog( parent, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint )
#if QT_VERSION >= 0x040500
: QDialog( parent, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint)
#else
: QDialog( parent, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint | 0x08000000)
#endif
{
setAttribute(Qt::WA_DeleteOnClose);
setModal(false);
/trunk/Scribus/scribus/scrpalettebase.cpp
47,7 → 47,7
#else
: QDialog ( parent, f | Qt::Tool | Qt::CustomizeWindowHint
| Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint
| Qt::WindowSystemMenuHint),
| Qt::WindowSystemMenuHint | 0x08000000),
#endif
palettePrefs(0),
prefsContextName(QString::null),