r18446 by craig - Remove USE_QT5 and all the Qt4 only code. Remove some QT version >4 code. Remove some cmake 2.6 cmake code, Set minimum cmake to 2.8.9 and qt min version to 5.0.0

scribus-commit scribus-commit at lists.scribus.net
Tue Sep 3 20:00:23 UTC 2013


Author: craig
Date: Tue Sep  3 20:00:22 2013
New Revision: 18446

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18446
Log:
Remove USE_QT5 and all the Qt4 only code. Remove some QT version >4 code. Remove some cmake 2.6 cmake code, Set minimum cmake to 2.8.9 and qt min version to 5.0.0

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/canvasgesture_rectselect.cpp
    trunk/Scribus/scribus/canvasmode_eyedropper.cpp
    trunk/Scribus/scribus/chartablemodel.cpp
    trunk/Scribus/scribus/fontlistmodel.cpp
    trunk/Scribus/scribus/guidesmodel.cpp
    trunk/Scribus/scribus/latexhelpers.cpp
    trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
    trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
    trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
    trunk/Scribus/scribus/plugins/pixmapexport/CMakeLists.txt
    trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
    trunk/Scribus/scribus/plugins/svgexplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
    trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
    trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
    trunk/Scribus/scribus/scimgdataloader_ps.cpp
    trunk/Scribus/scribus/scraction.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusapp.cpp
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/scribuswin.h
    trunk/Scribus/scribus/styles/CMakeLists.txt
    trunk/Scribus/scribus/text/CMakeLists.txt
    trunk/Scribus/scribus/ui/checkDocument.cpp
    trunk/Scribus/scribus/ui/cupsoptions.cpp
    trunk/Scribus/scribus/ui/extimageprops.cpp
    trunk/Scribus/scribus/ui/fontreplacedialog.cpp
    trunk/Scribus/scribus/ui/guidemanager.cpp
    trunk/Scribus/scribus/ui/guidemanager.h
    trunk/Scribus/scribus/ui/layers.cpp
    trunk/Scribus/scribus/ui/loremipsum.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_pages.cpp
    trunk/Scribus/scribus/ui/prefs_fonts.cpp
    trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
    trunk/Scribus/scribus/ui/preview.cpp
    trunk/Scribus/scribus/ui/replacecolors.cpp
    trunk/Scribus/scribus/ui/scdockpalette.cpp
    trunk/Scribus/scribus/ui/scdockpalette.h
    trunk/Scribus/scribus/ui/scrpalettebase.cpp
    trunk/Scribus/scribus/ui/scrpalettebase.h
    trunk/Scribus/scribus/ui/sctreewidget.cpp
    trunk/Scribus/scribus/ui/tablesideselector.cpp
    trunk/Scribus/scribus/ui/transparencypalette.cpp
    trunk/Scribus/scribus/ui/transparencypalette.h
    trunk/Scribus/scribus/undogui.cpp
    trunk/Scribus/scribus/undogui.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -971,21 +971,12 @@
   SET(SCRIBUS_MAIN_CPP main.cpp)
 ENDIF(WIN32)
 
-IF(USE_QT5)
 QT5_WRAP_UI(SCRIBUS_UI_SOURCES ${SCRIBUS_UI_SRC} )
 
 QT5_WRAP_CPP(SCRIBUS_MOC_SOURCES
 	${SCRIBUS_MOC_CLASSES}
 	${SCRIBUS_MOC_WIN32_ONLY_CLASSES}
 	)
-ELSE(USE_QT5)
-QT4_WRAP_UI(SCRIBUS_UI_SOURCES ${SCRIBUS_UI_SRC} )
-
-QT4_WRAP_CPP(SCRIBUS_MOC_SOURCES
-	${SCRIBUS_MOC_CLASSES}
-	${SCRIBUS_MOC_WIN32_ONLY_CLASSES}
-	)
-ENDIF(USE_QT5)
 
 LINK_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/colormgmt
@@ -1151,7 +1142,6 @@
 
 MESSAGE("RPATH: ${CMAKE_INSTALL_RPATH}")
 
-IF(USE_QT5)
 TARGET_LINK_LIBRARIES(${EXE_NAME}
   ${Qt5Core_LIBRARIES}
   ${Qt5Widgets_LIBRARIES}
@@ -1172,20 +1162,6 @@
   ${WIN32_ONLY_LIBS}
   ${GMAGICK_LIBRARIES}
 )
-ELSE(USE_QT5)
-TARGET_LINK_LIBRARIES(${EXE_NAME}
-  ${QT_LIBRARIES}
-  ${FREETYPE_LIBRARIES}
-  ${FONTCONFIG_LIBRARIES}
-  ${LIBXML2_LIBRARIES}
-  ${PYTHON_LIBRARIES}
-  ${TIFF_LIBRARIES}
-  ${JPEG_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${WIN32_ONLY_LIBS}
-  ${GMAGICK_LIBRARIES}
-)
-ENDIF(USE_QT5)
 
 IF (NOT WIN32 AND NOT HAIKU)
   TARGET_LINK_LIBRARIES(${EXE_NAME}
@@ -1257,7 +1233,7 @@
 ENDIF(HAVE_BOOST)
 
 # Now build plugins
-IF(USE_QT5)
+
 	SET(PLUGIN_LIBRARIES
 		${Qt5Core_LIBRARIES}
 		${Qt5Widgets_LIBRARIES}
@@ -1270,13 +1246,7 @@
 		${LIBXML2_LIBRARIES}
 		${ZLIB_LIBRARIES}
 		)
-ELSE(USE_QT5)
-	SET(PLUGIN_LIBRARIES
-		${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}
-		${LIBXML2_LIBRARIES}
-		${ZLIB_LIBRARIES}
-		)
-ENDIF(USE_QT5)
+
 IF(WIN32)
   # IF your plugin needs more than this, please link them privately
   # in the CMakeLists.txt for your plugin.

Modified: trunk/Scribus/scribus/canvasgesture_rectselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/canvasgesture_rectselect.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rectselect.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rectselect.cpp Tue Sep  3 20:00:22 2013
@@ -40,9 +40,8 @@
 	if (!m_rectangle)
 		m_rectangle = new QRubberBand(QRubberBand::Rectangle, m_view);
 	setStart(start);
-#ifdef USE_QT5
+//FIXME Move to new code like SelectionRubberBand
 	m_rectangle->setWindowOpacity(0.5);
-#endif
 	m_rectangle->setGeometry(QRect(m_view->mapFromGlobal(start), m_view->mapFromGlobal(start)));
 }
 

Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Tue Sep  3 20:00:22 2013
@@ -24,9 +24,7 @@
 #include <QMouseEvent>
 #include <QPoint>
 #include <QRect>
-#ifdef USE_QT5
-	#include <QScreen>
-#endif
+#include <QScreen>
 #include <QDebug>
 
 #include "canvas.h"
@@ -143,14 +141,10 @@
 	releaseMouse();
 
 	m_view->setCursor(QCursor(Qt::ArrowCursor));
-#ifdef USE_QT5
 	QPixmap pm;
 	QScreen *screen = QGuiApplication::primaryScreen();
 	if (screen)
 		pm = screen->grabWindow( QApplication::desktop()->winId(), m->globalPos().x(), m->globalPos().y(), 1, 1);
-#else
-	QPixmap pm = QPixmap::grabWindow( QApplication::desktop()->winId(), m->globalPos().x(), m->globalPos().y(), 1, 1);
-#endif
 	QImage i = pm.toImage();
 	QColor selectedColor=i.pixel(0, 0);
 

Modified: trunk/Scribus/scribus/chartablemodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/chartablemodel.cpp
==============================================================================
--- trunk/Scribus/scribus/chartablemodel.cpp (original)
+++ trunk/Scribus/scribus/chartablemodel.cpp Tue Sep  3 20:00:22 2013
@@ -101,14 +101,9 @@
 	// repaint only when doc differs
 	if (doc != m_doc)
 	{
-#ifdef USE_QT5
 		beginResetModel();
 		m_doc = doc;
 		endResetModel();
-#else
-		m_doc = doc;
-		reset();
-#endif
 	}
 }
 
@@ -119,9 +114,7 @@
 
 void CharTableModel::setCharacters(CharClassDef ch)
 {
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	m_characters.clear();
 	m_fonts.clear();
 	m_characters = ch;
@@ -129,27 +122,17 @@
 	{
 		m_fonts.append(m_fontInUse);
 	}
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 void CharTableModel::setCharactersAndFonts(CharClassDef ch, QStringList fonts)
 {
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	m_characters.clear();
 	m_fonts.clear();
 	m_characters = ch;
 	m_fonts = fonts;
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 void CharTableModel::addCharacter(QString ch)
@@ -162,16 +145,10 @@
 	int val = si.toInt(&ok, 10);
 	if (!ok)
 		return;
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	m_characters.append(val);
 	m_fonts.append(sf);
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 	if (orig < rowCount())
 		emit rowAppended();
 }
@@ -180,15 +157,9 @@
 {
 	if (font != m_fontInUse)
 	{
-#ifdef USE_QT5
-		beginResetModel();
-#endif
+		beginResetModel();
 		m_fontInUse = font;
-#ifdef USE_QT5
-		endResetModel();
-#else
-		reset();
-#endif
+		endResetModel();
 	}
 }
 
@@ -207,16 +178,10 @@
 
 	if ((!m_characters.contains(val)) || (!m_fonts.contains(sf)))
 	{
-#ifdef USE_QT5
-		beginResetModel();
-#endif
+		beginResetModel();
 		m_characters.append(val);
 		m_fonts.append(sf);
-#ifdef USE_QT5
-		endResetModel();
-#else
-		reset();
-#endif
+		endResetModel();
 	}
 	else
 	{
@@ -236,16 +201,10 @@
 {
 	if (index >= 0 && index < m_characters.size())
 	{
-#ifdef USE_QT5
-		beginResetModel();
-#endif
+		beginResetModel();
 		m_characters.removeAt(index);
 		m_fonts.removeAt(index);
-#ifdef USE_QT5
-		endResetModel();
-#else
-		reset();
-#endif
+		endResetModel();
 		return true;
 	}
 //	qDebug("CharTable::deleteOwnCharacter: no char deleted - logical error probably");

Modified: trunk/Scribus/scribus/fontlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/fontlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/fontlistmodel.cpp (original)
+++ trunk/Scribus/scribus/fontlistmodel.cpp Tue Sep  3 20:00:22 2013
@@ -27,16 +27,10 @@
 
 void FontListModel::setFonts(SCFonts f)
 {
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	m_fonts = f;
 	m_font_values = m_fonts.values();
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 int FontListModel::rowCount(const QModelIndex&) const

Modified: trunk/Scribus/scribus/guidesmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/guidesmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/guidesmodel.cpp (original)
+++ trunk/Scribus/scribus/guidesmodel.cpp Tue Sep  3 20:00:22 2013
@@ -90,16 +90,10 @@
 
 void GuidesModel::removeValues(const Guides & v)
 {
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	foreach(double i, v)
 		m_values.removeAll(value2pts(i, m_docUnitIndex));
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 // bool GuidesModel::removeRows(int row, int count, const QModelIndex & parent)
@@ -126,32 +120,20 @@
 void GuidesModel::insertRow()
 {
 // 	insertRows(rowCount(), 1);
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	if (m_values.contains(0.0))
 		return;
 	m_values.append(0.0);
 	qSort(m_values);
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 void GuidesModel::setValues(Guides values)
 {
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	m_values = values;
 	qSort(m_values);
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 Guides GuidesModel::values()
@@ -161,17 +143,11 @@
 
 void GuidesModel::unitChange(int docUnitIndex, int docUnitDecimals,double offset)
 {
-#ifdef USE_QT5
 	beginResetModel();
-#endif
 	rule = offset;
 	m_docUnitIndex = docUnitIndex;
 	m_docUnitDecimals = docUnitDecimals;
-#ifdef USE_QT5
 	endResetModel();
-#else
-	reset();
-#endif
 }
 
 #if 0

Modified: trunk/Scribus/scribus/latexhelpers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/latexhelpers.cpp
==============================================================================
--- trunk/Scribus/scribus/latexhelpers.cpp (original)
+++ trunk/Scribus/scribus/latexhelpers.cpp Tue Sep  3 20:00:22 2013
@@ -50,11 +50,7 @@
 		int index = text.indexOf(rule->regex);
 		while (index >= 0) {
 			int length;
-#ifdef USE_QT5
 			if (rule->regex.captureCount() == 0)
-#else
-			if (rule->regex.numCaptures() == 0)
-#endif
 			{
 				length = rule->regex.matchedLength();
 			}

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,9 @@
 
 SET(SCRIBUS_BARCODEGENERATOR_PLUGIN "barcodegenerator")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(BARCODEGENERATOR_PLUGIN_UI_SOURCES ${BARCODEGENERATOR_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(BARCODEGENERATOR_PLUGIN_MOC_SOURCES ${BARCODEGENERATOR_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(BARCODEGENERATOR_PLUGIN_UI_SOURCES ${BARCODEGENERATOR_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(BARCODEGENERATOR_PLUGIN_MOC_SOURCES ${BARCODEGENERATOR_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(BARCODEGENERATOR_PLUGIN_UI_SOURCES ${BARCODEGENERATOR_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(BARCODEGENERATOR_PLUGIN_MOC_SOURCES ${BARCODEGENERATOR_PLUGIN_MOC_CLASSES})
+
 
 ADD_LIBRARY(${SCRIBUS_BARCODEGENERATOR_PLUGIN} MODULE ${BARCODEGENERATOR_PLUGIN_SOURCES} ${BARCODEGENERATOR_PLUGIN_MOC_SOURCES} ${BARCODEGENERATOR_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -21,13 +21,9 @@
 
 SET(SCRIBUS_COLORWHEEL_PLUGIN "colorwheel")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(COLORWHEEL_PLUGIN_UI_SOURCES ${COLORWHEEL_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(COLORWHEEL_PLUGIN_MOC_SOURCES ${COLORWHEEL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(COLORWHEEL_PLUGIN_UI_SOURCES ${COLORWHEEL_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(COLORWHEEL_PLUGIN_MOC_SOURCES ${COLORWHEEL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(COLORWHEEL_PLUGIN_UI_SOURCES ${COLORWHEEL_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(COLORWHEEL_PLUGIN_MOC_SOURCES ${COLORWHEEL_PLUGIN_MOC_CLASSES})
+
 
 ADD_LIBRARY(${SCRIBUS_COLORWHEEL_PLUGIN} MODULE ${COLORWHEEL_PLUGIN_SOURCES} ${COLORWHEEL_PLUGIN_MOC_SOURCES} ${COLORWHEEL_PLUGIN_UI_CPP} ${COLORWHEEL_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_SCR12FORMAT_FL_PLUGIN "scribus12format")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCR12FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR12FORMAT_FL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCR12FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR12FORMAT_FL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCR12FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR12FORMAT_FL_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} MODULE ${SCR12FORMAT_FL_PLUGIN_SOURCES} ${SCR12FORMAT_FL_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} MODULE ${SCR134FORMAT_FL_PLUGIN_SOURCES} ${SCR134FORMAT_FL_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} MODULE ${SCR13FORMAT_FL_PLUGIN_SOURCES} ${SCR13FORMAT_FL_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -16,11 +16,7 @@
 
 SET(SCRIBUS_SCR150FORMAT_FL_PLUGIN "scribus150format")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCR150FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR150FORMAT_FL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCR150FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR150FORMAT_FL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCR150FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR150FORMAT_FL_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} MODULE ${SCR150FORMAT_FL_PLUGIN_SOURCES} ${SCR150FORMAT_FL_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,9 @@
 
 SET(SCRIBUS_FONTPREVIEW_PLUGIN "fontpreview")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(FONTPREVIEW_PLUGIN_UI_SOURCES ${FONTPREVIEW_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(FONTPREVIEW_PLUGIN_MOC_SOURCES ${FONTPREVIEW_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(FONTPREVIEW_PLUGIN_UI_SOURCES ${FONTPREVIEW_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(FONTPREVIEW_PLUGIN_MOC_SOURCES ${FONTPREVIEW_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(FONTPREVIEW_PLUGIN_UI_SOURCES ${FONTPREVIEW_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(FONTPREVIEW_PLUGIN_MOC_SOURCES ${FONTPREVIEW_PLUGIN_MOC_CLASSES})
+
 
 ADD_LIBRARY(${SCRIBUS_FONTPREVIEW_PLUGIN} MODULE ${FONTPREVIEW_PLUGIN_SOURCES} ${FONTPREVIEW_PLUGIN_MOC_SOURCES} ${FONTPREVIEW_PLUGIN_UI_CPP} ${FONTPREVIEW_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_CSV_GT_PLUGIN "csvim")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(CSV_GT_PLUGIN_MOC_SOURCES ${CSV_GT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(CSV_GT_PLUGIN_MOC_SOURCES ${CSV_GT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(CSV_GT_PLUGIN_MOC_SOURCES ${CSV_GT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_CSV_GT_PLUGIN} MODULE ${CSV_GT_PLUGIN_SOURCES} ${CSV_GT_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_DOC_GT_PLUGIN "docim")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(DOC_GT_PLUGIN_MOC_SOURCES ${DOC_GT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(DOC_GT_PLUGIN_MOC_SOURCES ${DOC_GT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(DOC_GT_PLUGIN_MOC_SOURCES ${DOC_GT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_DOC_GT_PLUGIN} MODULE ${DOC_GT_PLUGIN_SOURCES} ${DOC_GT_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -14,11 +14,7 @@
 
 SET(SCRIBUS_HTML_GT_PLUGIN "htmlim")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(HTML_GT_PLUGIN_MOC_SOURCES ${HTML_GT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(HTML_GT_PLUGIN_MOC_SOURCES ${HTML_GT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(HTML_GT_PLUGIN_MOC_SOURCES ${HTML_GT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES} ${HTML_GT_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -16,11 +16,7 @@
 
 SET(SCRIBUS_ODT_IM_PLUGIN "odtimplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(ODT_IM_PLUGIN_MOC_SOURCES ${ODT_IM_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(ODT_IM_PLUGIN_MOC_SOURCES ${ODT_IM_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(ODT_IM_PLUGIN_MOC_SOURCES ${ODT_IM_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES} ${ODT_IM_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -16,11 +16,7 @@
 
 SET(SCRIBUS_SXW_IM_PLUGIN "sxwimplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SXW_IM_PLUGIN_MOC_SOURCES ${SXW_IM_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SXW_IM_PLUGIN_MOC_SOURCES ${SXW_IM_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SXW_IM_PLUGIN_MOC_SOURCES ${SXW_IM_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES} ${SXW_IM_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -16,11 +16,7 @@
 
 SET(SCRIBUS_TEXTFILTER_GT_PLUGIN "textfilterplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(TEXTFILTER_GT_PLUGIN_MOC_SOURCES ${TEXTFILTER_GT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(TEXTFILTER_GT_PLUGIN_MOC_SOURCES ${TEXTFILTER_GT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(TEXTFILTER_GT_PLUGIN_MOC_SOURCES ${TEXTFILTER_GT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_TEXTFILTER_GT_PLUGIN} MODULE ${TEXTFILTER_GT_PLUGIN_SOURCES} ${TEXTFILTER_GT_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -17,11 +17,7 @@
 
 SET(SCRIBUS_XTG_IM_PLUGIN "xtgimplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(XTG_IM_PLUGIN_MOC_SOURCES ${XTG_IM_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(XTG_IM_PLUGIN_MOC_SOURCES ${XTG_IM_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(XTG_IM_PLUGIN_MOC_SOURCES ${XTG_IM_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_XTG_IM_PLUGIN} MODULE ${XTG_IM_PLUGIN_SOURCES} ${XTG_IM_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -22,11 +22,7 @@
 
 SET(SCRIBUS_IMPORTAI_PLUGIN "importai")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTAI_PLUGIN_MOC_SOURCES ${IMPORTAI_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTAI_PLUGIN_MOC_SOURCES ${IMPORTAI_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTAI_PLUGIN_MOC_SOURCES ${IMPORTAI_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTAI_PLUGIN} MODULE ${IMPORTAI_PLUGIN_SOURCES} ${IMPORTAI_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTCGM_PLUGIN "importcgm")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTCGM_PLUGIN_MOC_SOURCES ${IMPORTCGM_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTCGM_PLUGIN_MOC_SOURCES ${IMPORTCGM_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTCGM_PLUGIN_MOC_SOURCES ${IMPORTCGM_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTCGM_PLUGIN} MODULE ${IMPORTCGM_PLUGIN_SOURCES} ${IMPORTCGM_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTCVG_PLUGIN "importcvg")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTCVG_PLUGIN_MOC_SOURCES ${IMPORTCVG_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTCVG_PLUGIN_MOC_SOURCES ${IMPORTCVG_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTCVG_PLUGIN_MOC_SOURCES ${IMPORTCVG_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTCVG_PLUGIN} MODULE ${IMPORTCVG_PLUGIN_SOURCES} ${IMPORTCVG_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTDRW_PLUGIN "importdrw")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTDRW_PLUGIN_MOC_SOURCES ${IMPORTDRW_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTDRW_PLUGIN_MOC_SOURCES ${IMPORTDRW_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTDRW_PLUGIN_MOC_SOURCES ${IMPORTDRW_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTDRW_PLUGIN} MODULE ${IMPORTDRW_PLUGIN_SOURCES} ${IMPORTDRW_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -14,11 +14,7 @@
 
 SET(SCRIBUS_OODRAW_FL_PLUGIN "oodrawimp")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(OODRAW_FL_PLUGIN_MOC_SOURCES ${OODRAW_FL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(OODRAW_FL_PLUGIN_MOC_SOURCES ${OODRAW_FL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(OODRAW_FL_PLUGIN_MOC_SOURCES ${OODRAW_FL_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES} ${OODRAW_FL_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTPCT_PLUGIN "importpct")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTPCT_PLUGIN_MOC_SOURCES ${IMPORTPCT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTPCT_PLUGIN_MOC_SOURCES ${IMPORTPCT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTPCT_PLUGIN_MOC_SOURCES ${IMPORTPCT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTPCT_PLUGIN} MODULE ${IMPORTPCT_PLUGIN_SOURCES} ${IMPORTPCT_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -31,13 +31,8 @@
 
 SET(SCRIBUS_IMPORTPDF_PLUGIN "importpdf")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(IMPORTPDF_PLUGIN_UI_SOURCES ${IMPORTPDF_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(IMPORTPDF_PLUGIN_MOC_SOURCES ${IMPORTPDF_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(IMPORTPDF_PLUGIN_UI_SOURCES ${IMPORTPDF_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(IMPORTPDF_PLUGIN_MOC_SOURCES ${IMPORTPDF_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(IMPORTPDF_PLUGIN_UI_SOURCES ${IMPORTPDF_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(IMPORTPDF_PLUGIN_MOC_SOURCES ${IMPORTPDF_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES} ${IMPORTPDF_PLUGIN_MOC_SOURCES} ${IMPORTPDF_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTSHAPE_PLUGIN "importshape")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTSHAPE_PLUGIN_MOC_SOURCES ${IMPORTSHAPE_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTSHAPE_PLUGIN_MOC_SOURCES ${IMPORTSHAPE_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTSHAPE_PLUGIN_MOC_SOURCES ${IMPORTSHAPE_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTSHAPE_PLUGIN} MODULE ${IMPORTSHAPE_PLUGIN_SOURCES} ${IMPORTSHAPE_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTSML_PLUGIN "importsml")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTSML_PLUGIN_MOC_SOURCES ${IMPORTSML_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTSML_PLUGIN_MOC_SOURCES ${IMPORTSML_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTSML_PLUGIN_MOC_SOURCES ${IMPORTSML_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTSML_PLUGIN} MODULE ${IMPORTSML_PLUGIN_SOURCES} ${IMPORTSML_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_IMPORTSVG_PLUGIN "svgimplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTSVG_PLUGIN_MOC_SOURCES ${IMPORTSVG_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTSVG_PLUGIN_MOC_SOURCES ${IMPORTSVG_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTSVG_PLUGIN_MOC_SOURCES ${IMPORTSVG_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTSVG_PLUGIN} MODULE ${IMPORTSVG_PLUGIN_SOURCES} ${IMPORTSVG_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_IMPORTUNICONVERTOR_PLUGIN "uniconvertorplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES ${IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES ${IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES ${IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} MODULE ${IMPORTUNICONVERTOR_PLUGIN_SOURCES} ${IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -16,11 +16,7 @@
 
 SET(SCRIBUS_IMPORTWMF_PLUGIN "wmfimplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTWMF_PLUGIN_MOC_SOURCES ${IMPORTWMF_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTWMF_PLUGIN_MOC_SOURCES ${IMPORTWMF_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTWMF_PLUGIN_MOC_SOURCES ${IMPORTWMF_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTWMF_PLUGIN} MODULE ${IMPORTWMF_PLUGIN_SOURCES} ${IMPORTWMF_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -12,11 +12,8 @@
     importwpgplugin.cpp
   )
 SET(SCRIBUS_IMPORTWPG_PLUGIN "importwpg")
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTWPG_PLUGIN_MOC_SOURCES ${IMPORTWPG_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTWPG_PLUGIN_MOC_SOURCES ${IMPORTWPG_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTWPG_PLUGIN_MOC_SOURCES ${IMPORTWPG_PLUGIN_MOC_CLASSES})
+
 ADD_LIBRARY(${SCRIBUS_IMPORTWPG_PLUGIN} MODULE ${IMPORTWPG_PLUGIN_SOURCES} ${IMPORTWPG_PLUGIN_MOC_SOURCES})
 TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTWPG_PLUGIN} ${PLUGIN_LIBRARIES})
 INSTALL(TARGETS ${SCRIBUS_IMPORTWPG_PLUGIN}

Modified: trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -17,11 +17,7 @@
 
 SET(SCRIBUS_IMPORTXAR_PLUGIN "importxar")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTXAR_PLUGIN_MOC_SOURCES ${IMPORTXAR_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTXAR_PLUGIN_MOC_SOURCES ${IMPORTXAR_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTXAR_PLUGIN_MOC_SOURCES ${IMPORTXAR_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTXAR_PLUGIN} MODULE ${IMPORTXAR_PLUGIN_SOURCES} ${IMPORTXAR_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_IMPORTXFIG_PLUGIN "importxfig")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTXFIG_PLUGIN_MOC_SOURCES ${IMPORTXFIG_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTXFIG_PLUGIN_MOC_SOURCES ${IMPORTXFIG_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTXFIG_PLUGIN_MOC_SOURCES ${IMPORTXFIG_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTXFIG_PLUGIN} MODULE ${IMPORTXFIG_PLUGIN_SOURCES} ${IMPORTXFIG_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -34,13 +34,8 @@
 
 SET(SCRIBUS_PICTUREBROWSER_PLUGIN "picturebrowser")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(PICTUREBROWSER_PLUGIN_UI_SOURCES ${PICTUREBROWSER_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(PICTUREBROWSER_PLUGIN_MOC_SOURCES ${PICTUREBROWSER_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(PICTUREBROWSER_PLUGIN_UI_SOURCES ${PICTUREBROWSER_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(PICTUREBROWSER_PLUGIN_MOC_SOURCES ${PICTUREBROWSER_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(PICTUREBROWSER_PLUGIN_UI_SOURCES ${PICTUREBROWSER_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(PICTUREBROWSER_PLUGIN_MOC_SOURCES ${PICTUREBROWSER_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_PICTUREBROWSER_PLUGIN} MODULE ${PICTUREBROWSER_PLUGIN_SOURCES}
 ${PICTUREBROWSER_PLUGIN_MOC_SOURCES} ${PICTUREBROWSER_PLUGIN_UI_SOURCES})

Modified: trunk/Scribus/scribus/plugins/pixmapexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/pixmapexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/pixmapexport/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/pixmapexport/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,8 @@
 
 SET(SCRIBUS_PIXMAPEXPORT_PLUGIN "scribusexportpixmap")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_PIXMAPEXPORT_PLUGIN} MODULE ${SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,8 @@
 
 SET(SCRIBUS_SAVEASTEMPLATE_PLUGIN "saveastemplateplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(SAVEASTEMPLATE_PLUGIN_UI_SOURCES ${SAVEASTEMPLATE_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(SAVEASTEMPLATE_PLUGIN_MOC_SOURCES ${SAVEASTEMPLATE_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(SAVEASTEMPLATE_PLUGIN_UI_SOURCES ${SAVEASTEMPLATE_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(SAVEASTEMPLATE_PLUGIN_MOC_SOURCES ${SAVEASTEMPLATE_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(SAVEASTEMPLATE_PLUGIN_UI_SOURCES ${SAVEASTEMPLATE_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(SAVEASTEMPLATE_PLUGIN_MOC_SOURCES ${SAVEASTEMPLATE_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} MODULE ${SAVEASTEMPLATE_PLUGIN_SOURCES}
 			${SAVEASTEMPLATE_PLUGIN_MOC_SOURCES} ${SAVEASTEMPLATE_PLUGIN_UI_SOURCES})

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -57,13 +57,8 @@
 
 SET(SCRIBUS_SCRIPTER_PLUGIN "scriptplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(SCRIPTER_PLUGIN_UI_SOURCES ${SCRIPTER_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(SCRIPTER_PLUGIN_UI_SOURCES ${SCRIPTER_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(SCRIPTER_PLUGIN_UI_SOURCES ${SCRIPTER_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCRIPTER_PLUGIN} MODULE 
   ${SCRIPTER_PLUGIN_SOURCES}

Modified: trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -29,13 +29,8 @@
 
 SET(SCRIBUS_SHORTWORDS_PLUGIN "scribusshortwords")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(SHORTWORDS_PLUGIN_UI_SOURCES ${SHORTWORDS_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(SHORTWORDS_PLUGIN_MOC_SOURCES ${SHORTWORDS_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(SHORTWORDS_PLUGIN_UI_SOURCES ${SHORTWORDS_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(SHORTWORDS_PLUGIN_MOC_SOURCES ${SHORTWORDS_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(SHORTWORDS_PLUGIN_UI_SOURCES ${SHORTWORDS_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(SHORTWORDS_PLUGIN_MOC_SOURCES ${SHORTWORDS_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SHORTWORDS_PLUGIN} MODULE
 ${SHORTWORDS_PLUGIN_SOURCES}

Modified: trunk/Scribus/scribus/plugins/svgexplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/svgexplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/svgexplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/svgexplugin/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_EXPORTSVG_PLUGIN "svgexplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(EXPORTSVG_PLUGIN_MOC_SOURCES ${EXPORTSVG_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(EXPORTSVG_PLUGIN_MOC_SOURCES ${EXPORTSVG_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(EXPORTSVG_PLUGIN_MOC_SOURCES ${EXPORTSVG_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_EXPORTSVG_PLUGIN} MODULE ${EXPORTSVG_PLUGIN_SOURCES} ${EXPORTSVG_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,9 @@
 
 SET(SCRIBUS_MESHDISTORTION_PLUGIN "meshdistortion")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(MESHDISTORTION_PLUGIN_UI_SOURCES ${MESHDISTORTION_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(MESHDISTORTION_PLUGIN_MOC_SOURCES ${MESHDISTORTION_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(MESHDISTORTION_PLUGIN_UI_SOURCES ${MESHDISTORTION_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(MESHDISTORTION_PLUGIN_MOC_SOURCES ${MESHDISTORTION_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(MESHDISTORTION_PLUGIN_UI_SOURCES ${MESHDISTORTION_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(MESHDISTORTION_PLUGIN_MOC_SOURCES ${MESHDISTORTION_PLUGIN_MOC_CLASSES})
+
 
 ADD_LIBRARY(${SCRIBUS_MESHDISTORTION_PLUGIN} MODULE ${MESHDISTORTION_PLUGIN_SOURCES} ${MESHDISTORTION_PLUGIN_MOC_SOURCES} ${MESHDISTORTION_PLUGIN_UI_CPP} ${MESHDISTORTION_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp Tue Sep  3 20:00:22 2013
@@ -47,11 +47,7 @@
 	setPen(QPen(Qt::red, 2.0));
 	setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
 	setZValue(9999999);
-#ifdef USE_QT5
 	acceptHoverEvents();
-#else
-	setAcceptsHoverEvents(true);
-#endif
 	mouseMoving = false;
 	mousePressed = false;
 }
@@ -233,11 +229,7 @@
 		{
 			scene.addItem(pItem);
 			pItem->setPos(currItem->xPos() - gx + deltaX, currItem->yPos() - gy + deltaY);
-#ifdef USE_QT5
 			pItem->setRotation(currItem->rotation());
-#else
-			pItem->rotate(currItem->rotation());
-#endif
 		}
 		else
 		{
@@ -246,11 +238,7 @@
 		//	mm.translate(-parent->xPos(), -parent->yPos());
 		//	pItem->setPos(mm.map(QPointF(currItem->xPos(), currItem->yPos())));
 			pItem->setPos(QPointF(currItem->gXpos, currItem->gYpos));
-#ifdef USE_QT5
 			pItem->setRotation(currItem->rotation());
-#else
-			pItem->rotate(currItem->rotation());
-#endif
 		}
 		QPainterPath pathO = pp;
 		QTransform mmO;

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,9 @@
 
 SET(SCRIBUS_PATHALONGPATH_PLUGIN "pathalongpath")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(PATHALONGPATH_PLUGIN_UI_SOURCES ${PATHALONGPATH_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(PATHALONGPATH_PLUGIN_MOC_SOURCES ${PATHALONGPATH_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(PATHALONGPATH_PLUGIN_UI_SOURCES ${PATHALONGPATH_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(PATHALONGPATH_PLUGIN_MOC_SOURCES ${PATHALONGPATH_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(PATHALONGPATH_PLUGIN_UI_SOURCES ${PATHALONGPATH_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(PATHALONGPATH_PLUGIN_MOC_SOURCES ${PATHALONGPATH_PLUGIN_MOC_CLASSES})
+
 
 ADD_LIBRARY(${SCRIBUS_PATHALONGPATH_PLUGIN} MODULE ${PATHALONGPATH_PLUGIN_SOURCES} ${PATHALONGPATH_PLUGIN_MOC_SOURCES} ${PATHALONGPATH_PLUGIN_UI_CPP} ${PATHALONGPATH_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_FLATTENPATH_PLUGIN "flattenpath")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(FLATTENPATH_PLUGIN_MOC_SOURCES ${FLATTENPATH_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(FLATTENPATH_PLUGIN_MOC_SOURCES ${FLATTENPATH_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(FLATTENPATH_PLUGIN_MOC_SOURCES ${FLATTENPATH_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES} ${FLATTENPATH_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -25,13 +25,9 @@
 
   SET(SCRIBUS_HUNSPELL_PLUGIN "hunspellplugin")
 
-IF(USE_QT5)
-  QT5_WRAP_UI(HUNSPELL_PLUGIN_UI_SOURCES ${HUNSPELL_PLUGIN_UI_SRC} )
-  QT5_WRAP_CPP(HUNSPELL_PLUGIN_MOC_SOURCES ${HUNSPELL_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-  QT4_WRAP_UI(HUNSPELL_PLUGIN_UI_SOURCES ${HUNSPELL_PLUGIN_UI_SRC} )
-  QT4_WRAP_CPP(HUNSPELL_PLUGIN_MOC_SOURCES ${HUNSPELL_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(HUNSPELL_PLUGIN_UI_SOURCES ${HUNSPELL_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(HUNSPELL_PLUGIN_MOC_SOURCES ${HUNSPELL_PLUGIN_MOC_CLASSES})
+
 
   ADD_LIBRARY(${SCRIBUS_HUNSPELL_PLUGIN} MODULE
     ${HUNSPELL_PLUGIN_SOURCES}

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,8 @@
 
 SET(SCRIBUS_LENSEFFECTS_PLUGIN "lenseffects")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(LENSEFFECTS_PLUGIN_UI_SOURCES ${LENSEFFECTS_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(LENSEFFECTS_PLUGIN_MOC_SOURCES ${LENSEFFECTS_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(LENSEFFECTS_PLUGIN_UI_SOURCES ${LENSEFFECTS_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(LENSEFFECTS_PLUGIN_MOC_SOURCES ${LENSEFFECTS_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(LENSEFFECTS_PLUGIN_UI_SOURCES ${LENSEFFECTS_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(LENSEFFECTS_PLUGIN_MOC_SOURCES ${LENSEFFECTS_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_LENSEFFECTS_PLUGIN} MODULE ${LENSEFFECTS_PLUGIN_SOURCES} ${LENSEFFECTS_PLUGIN_MOC_SOURCES} ${LENSEFFECTS_PLUGIN_UI_CPP} ${LENSEFFECTS_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp Tue Sep  3 20:00:22 2013
@@ -45,16 +45,11 @@
 	radialGrad.setColorAt(0.0, QColor(255, 0, 0, 127));
 	radialGrad.setColorAt(0.1, QColor(255, 0, 0, 127));
 	radialGrad.setColorAt(1.0, QColor(255, 255, 255, 0));
-#if QT_VERSION  >= 0x040301
 	radialGrad.setCoordinateMode(QGradient::ObjectBoundingMode);
-#endif
 	setBrush(radialGrad);
 	setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-#ifdef USE_QT5
 	acceptHoverEvents();
-#else
-	setAcceptsHoverEvents(true);
-#endif
+
 }
 
 void LensItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -299,11 +294,7 @@
 		{
 			scene.addItem(pItem);
 			pItem->setPos(currItem->xPos() - gx, currItem->yPos() - gy);
-#ifdef USE_QT5
 			pItem->setRotation(currItem->rotation());
-#else
-			pItem->rotate(currItem->rotation());
-#endif
 		}
 		else
 		{

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,13 +19,8 @@
 
 SET(SCRIBUS_PATHCONNECT_PLUGIN "pathconnect")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(PATHCONNECT_PLUGIN_UI_SOURCES ${PATHCONNECT_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(PATHCONNECT_PLUGIN_MOC_SOURCES ${PATHCONNECT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(PATHCONNECT_PLUGIN_UI_SOURCES ${PATHCONNECT_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(PATHCONNECT_PLUGIN_MOC_SOURCES ${PATHCONNECT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(PATHCONNECT_PLUGIN_UI_SOURCES ${PATHCONNECT_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(PATHCONNECT_PLUGIN_MOC_SOURCES ${PATHCONNECT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_PATHCONNECT_PLUGIN} MODULE ${PATHCONNECT_PLUGIN_SOURCES} ${PATHCONNECT_PLUGIN_MOC_SOURCES} ${PATHCONNECT_PLUGIN_UI_CPP} ${PATHCONNECT_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -18,11 +18,7 @@
 
 SET(SCRIBUS_PATHCUT_PLUGIN "pathcut")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(PATHCUT_PLUGIN_MOC_SOURCES ${PATHCUT_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(PATHCUT_PLUGIN_MOC_SOURCES ${PATHCUT_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(PATHCUT_PLUGIN_MOC_SOURCES ${PATHCUT_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_PATHCUT_PLUGIN} MODULE ${PATHCUT_PLUGIN_SOURCES} ${PATHCUT_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -28,13 +28,9 @@
 
 SET(SCRIBUS_PATHFINDER_PLUGIN "pathfinder")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(PATHFINDER_PLUGIN_UI_SOURCES ${PATHFINDER_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(PATHFINDER_PLUGIN_MOC_SOURCES ${PATHFINDER_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(PATHFINDER_PLUGIN_UI_SOURCES ${PATHFINDER_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(PATHFINDER_PLUGIN_MOC_SOURCES ${PATHFINDER_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(PATHFINDER_PLUGIN_UI_SOURCES ${PATHFINDER_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(PATHFINDER_PLUGIN_MOC_SOURCES ${PATHFINDER_PLUGIN_MOC_CLASSES})
+
 
 ADD_LIBRARY(${SCRIBUS_PATHFINDER_PLUGIN} MODULE ${PATHFINDER_PLUGIN_SOURCES} ${PATHFINDER_PLUGIN_MOC_SOURCES} ${PATHFINDER_PLUGIN_UI_CPP} ${PATHFINDER_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_PATHSTROKER_PLUGIN "pathstroker")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(PATHSTROKER_PLUGIN_MOC_SOURCES ${PATHSTROKER_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(PATHSTROKER_PLUGIN_MOC_SOURCES ${PATHSTROKER_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(PATHSTROKER_PLUGIN_MOC_SOURCES ${PATHSTROKER_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_PATHSTROKER_PLUGIN} MODULE ${PATHSTROKER_PLUGIN_SOURCES} ${PATHSTROKER_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_SMOOTHPATH_PLUGIN "smoothpath")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SMOOTHPATH_PLUGIN_MOC_SOURCES ${SMOOTHPATH_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SMOOTHPATH_PLUGIN_MOC_SOURCES ${SMOOTHPATH_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SMOOTHPATH_PLUGIN_MOC_SOURCES ${SMOOTHPATH_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES} ${SMOOTHPATH_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -13,11 +13,7 @@
 
 SET(SCRIBUS_SUBDIVIDE_PLUGIN "subdivide")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SUBDIVIDE_PLUGIN_MOC_SOURCES ${SUBDIVIDE_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SUBDIVIDE_PLUGIN_MOC_SOURCES ${SUBDIVIDE_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SUBDIVIDE_PLUGIN_MOC_SOURCES ${SUBDIVIDE_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SUBDIVIDE_PLUGIN} MODULE ${SUBDIVIDE_PLUGIN_SOURCES} ${SUBDIVIDE_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_jpeg.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_jpeg.cpp Tue Sep  3 20:00:22 2013
@@ -362,11 +362,7 @@
 	else if ( cinfo.output_components == 1 )
 	{
 		m_image = QImage( cinfo.output_width, cinfo.output_height, QImage::Format_Indexed8 );
-#ifdef USE_QT5
 		m_image.setColorCount(256);
-#else
-		m_image.setNumColors(256);
-#endif
 		for (int i=0; i<256; i++)
 			m_image.setColor(i, qRgb(i,i,i));
 	}

Modified: trunk/Scribus/scribus/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_ps.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_ps.cpp Tue Sep  3 20:00:22 2013
@@ -923,11 +923,7 @@
 	else if ( cinfo.output_components == 1 )
 	{
 		m_image = QImage( cinfo.output_width, cinfo.output_height, QImage::Format_Indexed8 );
-#ifdef USE_QT5
 		m_image.setColorCount(256);
-#else
-		m_image.setNumColors(256);
-#endif
 		for (int i=0; i<256; i++)
 			m_image.setColor(i, qRgb(i,i,i));
 	}
@@ -1047,11 +1043,7 @@
 	else if ( cinfo.output_components == 1 )
 	{
 		tmpImg = QImage( cinfo.output_width, cinfo.output_height, QImage::Format_Indexed8 );
-#ifdef USE_QT5
 		m_image.setColorCount(256);
-#else
-		m_image.setNumColors(256);
-#endif
 		for (int i=0; i<256; i++)
 			tmpImg.setColor(i, qRgb(i,i,i));
 		m_pixelFormat = Format_GRAY_8;

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp (original)
+++ trunk/Scribus/scribus/scraction.cpp Tue Sep  3 20:00:22 2013
@@ -240,11 +240,7 @@
 
 void ScrAction::setToolTipFromTextAndShortcut()
 {
-#ifdef USE_QT5
 	QString sct(shortcut().toString());
-#else
-	QString sct(shortcut());
-#endif
 	if (sct.isEmpty())
 		QAction::setToolTip("<qt>" + cleanMenuText() + "</qt>");
 	else

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Sep  3 20:00:22 2013
@@ -533,11 +533,7 @@
 	{
 		if ((ScrAction*)(it.value())!=NULL)
 		{
-#ifdef USE_QT5
 			QString accelerator = it.value()->shortcut().toString();
-#else
-			QString accelerator = it.value()->shortcut();
-#endif
 			prefsManager->setKeyEntry(it.key(), it.value()->cleanMenuText(), accelerator,0);
 		}
 		//else
@@ -1333,13 +1329,8 @@
 			keyMod |= Qt::ALT;
 
 		QKeySequence currKeySeq = QKeySequence(k->key() | keyMod);
-#ifdef USE_QT5
 		if (QString(currKeySeq.toString()).isNull())
 			return false;
-#else
-		if (QString(currKeySeq).isNull())
-			return false;
-#endif
 		retVal=true;
 		//Palette actions
 		if (currKeySeq == scrActions["specialToggleAllPalettes"]->shortcut())

Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Tue Sep  3 20:00:22 2013
@@ -190,13 +190,11 @@
 	if (runtests)
 		RunTests::runTests(testargsc, testargsv);
 #endif
-#ifndef USE_QT5  // currently disabled as it needs a complete rewrite in Qt 5
 	if (runUpgradeCheck)
 	{
 		UpgradeChecker uc;
 		uc.fetch();
 	}
-#endif
 	//Dont run the GUI init process called from main.cpp, and return
 	if (!header)
 		useGUI=true;

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Tue Sep  3 20:00:22 2013
@@ -168,13 +168,3 @@
 	statusBar()->setSizeGripEnabled(!isMaximized());
 }
 
-#ifndef USE_QT5
-void ScribusWin::windowActivationChange ( bool oldActive )
-{
-	if( isActiveWindow() )
-		QDir::setCurrent( currentDir );
-	else
-		currentDir = QDir::currentPath();
-	QMainWindow::windowActivationChange( oldActive );
-}
-#endif

Modified: trunk/Scribus/scribus/scribuswin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/scribuswin.h
==============================================================================
--- trunk/Scribus/scribus/scribuswin.h (original)
+++ trunk/Scribus/scribus/scribuswin.h Tue Sep  3 20:00:22 2013
@@ -66,9 +66,6 @@
 	void AutoSaved();
 
 protected:
-#ifndef USE_QT5
-	virtual void windowActivationChange ( bool oldActive );
-#endif
 	QString currentDir;
 	QHBoxLayout* statusFrameLayout;
 	ScribusMainWindow* m_MainWindow;

Modified: trunk/Scribus/scribus/styles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/styles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/styles/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/styles/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -19,11 +19,8 @@
   cellstyle.cpp
 )
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCRIBUS_STYLES_MOC_SOURCES ${SCRIBUS_STYLES_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCRIBUS_STYLES_MOC_SOURCES ${SCRIBUS_STYLES_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCRIBUS_STYLES_MOC_SOURCES ${SCRIBUS_STYLES_MOC_CLASSES})
+
 
 SET(SCRIBUS_STYLES_LIB "scribus_styles_lib")
 ADD_LIBRARY(${SCRIBUS_STYLES_LIB} STATIC ${SCRIBUS_STYLES_LIB_SOURCES} ${SCRIBUS_STYLES_MOC_SOURCES})

Modified: trunk/Scribus/scribus/text/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/text/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/text/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/text/CMakeLists.txt Tue Sep  3 20:00:22 2013
@@ -18,11 +18,9 @@
 )
 
 
-IF(USE_QT5)
-  QT5_WRAP_CPP(SCRIBUS_TEXT_MOC_SOURCES ${SCRIBUS_TEXT_MOC_CLASSES})
-ELSE(USE_QT5)
-  QT4_WRAP_CPP(SCRIBUS_TEXT_MOC_SOURCES ${SCRIBUS_TEXT_MOC_CLASSES})
-ENDIF(USE_QT5)
+
+QT5_WRAP_CPP(SCRIBUS_TEXT_MOC_SOURCES ${SCRIBUS_TEXT_MOC_CLASSES})
+
 
 
 

Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Tue Sep  3 20:00:22 2013
@@ -63,13 +63,8 @@
 	checkDocumentLayout->addLayout( layout1 );
 
 	reportDisplay = new QTreeWidget( this );
-#ifdef USE_QT5
 	reportDisplay->header()->setSectionsClickable(false );
 	reportDisplay->header()->setSectionsMovable( false );
-#else
-	reportDisplay->header()->setClickable( false );
-	reportDisplay->header()->setMovable( false );
-#endif
 	reportDisplay->setSortingEnabled(false);
 	reportDisplay->setAlternatingRowColors(true);
 	checkDocumentLayout->addWidget( reportDisplay );

Modified: trunk/Scribus/scribus/ui/cupsoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/cupsoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cupsoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/cupsoptions.cpp Tue Sep  3 20:00:22 2013
@@ -65,15 +65,9 @@
 	Table->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Value")));
 	QHeaderView* headerH = Table->horizontalHeader();
 	headerH->setStretchLastSection(true);
-#ifdef USE_QT5
 	headerH->setSectionsClickable(false );
 	headerH->setSectionsMovable( false );
 	headerH->setSectionResizeMode(QHeaderView::Fixed);
-#else
-	headerH->setMovable(false);
-	headerH->setClickable(false);
-	headerH->setResizeMode(QHeaderView::Fixed);
-#endif
 	Table->setMinimumSize(300, 100);
 #ifdef HAVE_CUPS
 	int i;

Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Tue Sep  3 20:00:22 2013
@@ -134,13 +134,8 @@
 		layerTable->setHorizontalHeaderItem(2, new QTableWidgetItem( tr("Name")));
 		QHeaderView* headerH = layerTable->horizontalHeader();
 		headerH->setStretchLastSection(true);
-#ifdef USE_QT5
 		headerH->setSectionsClickable(false );
 		headerH->setSectionsMovable( false );
-#else
-		headerH->setMovable(false);
-		headerH->setClickable(false);
-#endif
 		if (info->layerInfo.count() == 1)
 		{
 			layerTable->setColumnWidth(1, 40);
@@ -149,13 +144,8 @@
 		layerTable->setSortingEnabled(false);
 		layerTable->setSelectionBehavior( QAbstractItemView::SelectRows );
 		QHeaderView *Header = layerTable->verticalHeader();
-#ifdef USE_QT5
 		Header->setSectionsMovable( false );
 		Header->setSectionResizeMode(QHeaderView::Fixed);
-#else
-		Header->setMovable(false);
-		Header->setResizeMode(QHeaderView::Fixed);
-#endif
 		Header->hide();
 		FlagsSicht.clear();
 		int col2Width = 0;

Modified: trunk/Scribus/scribus/ui/fontreplacedialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/fontreplacedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontreplacedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/fontreplacedialog.cpp Tue Sep  3 20:00:22 2013
@@ -47,15 +47,9 @@
 	replacementTable->setSortingEnabled(false);
 	replacementTable->setSelectionBehavior( QAbstractItemView::SelectRows );
 	QHeaderView *header = replacementTable->horizontalHeader();
-#ifdef USE_QT5
 	header->setSectionsClickable(false );
 	header->setSectionsMovable( false );
 	header->setSectionResizeMode(QHeaderView::Stretch);
-#else
-	header->setMovable(false);
-	header->setClickable(false);
-	header->setResizeMode(QHeaderView::Stretch);
-#endif
 	replacementTable->verticalHeader()->hide();
 	replacementTable->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 	replacementTable->setRowCount(RList->count());

Modified: trunk/Scribus/scribus/ui/guidemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/guidemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/guidemanager.cpp Tue Sep  3 20:00:22 2013
@@ -573,19 +573,6 @@
 	m_Doc->changed();
 }
 
-#ifndef USE_QT5
-void GuideManager::windowActivationChange(bool oldActive)
-{
-	if (m_Doc)
-	{
-		bool enable = !m_Doc->m_Selection->isEmpty();
-		horizontalSelectionAutoButton->setEnabled(enable);
-		verticalSelectionAutoButton->setEnabled(enable);
-	}
-	QDialog::windowActivationChange( oldActive );
-}
-#endif
-
 Guides GuideManager::getAutoVerticals(ScPage * page)
 {
 	GuideManagerCore guides;

Modified: trunk/Scribus/scribus/ui/guidemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/guidemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.h (original)
+++ trunk/Scribus/scribus/ui/guidemanager.h Tue Sep  3 20:00:22 2013
@@ -99,13 +99,6 @@
 	\param page A reference to the page to store values. */
 	void storePageValues(ScPage * page);
 
-	/*! \brief Overriden QDialog method to operate selection related widgets.
-	Auto guides tab. It disables the "selection" radio buttons when there
-	is no selection on current page. */
-#ifndef USE_QT5
-	void windowActivationChange(bool oldActive);
-#endif
-
 	/*! \brief Create automatic horizontal guides.
 	Calculates positions of the guides.
 	\param p a Page for what should be calculation performed

Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Tue Sep  3 20:00:22 2013
@@ -78,15 +78,9 @@
 
 	QHeaderView *header = Table->horizontalHeader();
 	header->setStretchLastSection(true);
-#ifdef USE_QT5
 	header->setSectionsClickable(false );
 	header->setSectionsMovable( false );
 	header->setSectionResizeMode(QHeaderView::Fixed);
-#else
-	header->setMovable(false);
-	header->setClickable(true);
-	header->setResizeMode(QHeaderView::Fixed);
-#endif
 	header->setHighlightSections(false);
 
 	Table->setColumnWidth(0, 24);
@@ -99,13 +93,8 @@
 	Table->setSortingEnabled(false);
 	Table->setSelectionBehavior( QAbstractItemView::SelectRows );
 	QHeaderView *Header = Table->verticalHeader();
-#ifdef USE_QT5
 	Header->setSectionsMovable( false );
 	Header->setSectionResizeMode(QHeaderView::Fixed);
-#else
-	Header->setMovable(false);
-	Header->setResizeMode(QHeaderView::Fixed);
-#endif
 	Header->hide();
 	LayerPaletteLayout->addWidget( Table );
 

Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Tue Sep  3 20:00:22 2013
@@ -153,13 +153,8 @@
 	loremList->setRootIsDecorated(true);
 	loremList->setColumnCount(1);
 	loremList->setHeaderLabel( tr("Select Lorem Ipsum"));
-#ifdef USE_QT5
 	loremList->header()->setSectionsClickable( false );
 	loremList->header()->setSectionResizeMode( QHeaderView::ResizeToContents );
-#else
-	loremList->header()->setClickable( false );
-	loremList->header()->setResizeMode( QHeaderView::ResizeToContents );
-#endif
 	loremList->setSelectionMode(QAbstractItemView::SingleSelection);
 	layout3->addWidget( loremList );
 

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Tue Sep  3 20:00:22 2013
@@ -393,13 +393,8 @@
 	reportDisplay->setRootIsDecorated( true );
 	reportDisplay->setColumnCount(1);
 	reportDisplay->setHeaderLabel( tr("Element"));
-#ifdef USE_QT5
 	reportDisplay->header()->setSectionsClickable(false );
 	reportDisplay->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-#else
-	reportDisplay->header()->setClickable( false );
-	reportDisplay->header()->setResizeMode( QHeaderView::ResizeToContents );
-#endif
 	reportDisplay->setSortingEnabled(false);
 	reportDisplay->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	reportDisplay->setContextMenuPolicy(Qt::CustomContextMenu);

Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Tue Sep  3 20:00:22 2013
@@ -43,22 +43,12 @@
 	masterPageList->setIconSize(QSize(60, 60));
 
 	QHeaderView *Header = pageView->verticalHeader();
-#ifdef USE_QT5
 	Header->setSectionsMovable(false);
 	Header->setSectionResizeMode(QHeaderView::Fixed);
-#else
-	Header->setMovable(false);
-	Header->setResizeMode(QHeaderView::Fixed);
-#endif
 	Header->hide();
 	Header = pageView->horizontalHeader();
-#ifdef USE_QT5
 	Header->setSectionsMovable(false);
 	Header->setSectionResizeMode(QHeaderView::Fixed);
-#else
-	Header->setMovable(false);
-	Header->setResizeMode(QHeaderView::Fixed);
-#endif
 	Header->hide();
 	pageView->setSortingEnabled(false);
 	pageView->setSelectionMode( QAbstractItemView::NoSelection );

Modified: trunk/Scribus/scribus/ui/prefs_fonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/prefs_fonts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_fonts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_fonts.cpp Tue Sep  3 20:00:22 2013
@@ -57,15 +57,9 @@
 	fontSubstitutionsTableWidget->setSortingEnabled(false);
 	fontSubstitutionsTableWidget->setSelectionBehavior( QAbstractItemView::SelectRows );
 	QHeaderView *header = fontSubstitutionsTableWidget->horizontalHeader();
-#ifdef USE_QT5
 	header->setSectionsMovable(false);
 	header->setSectionsClickable(false);
 	header->setSectionResizeMode(QHeaderView::Stretch);
-#else
-	header->setMovable(false);
-	header->setClickable(false);
-	header->setResizeMode(QHeaderView::Stretch);
-#endif
 	fontSubstitutionsTableWidget->verticalHeader()->hide();
 	fontSubstitutionsTableWidget->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 

Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Tue Sep  3 20:00:22 2013
@@ -290,46 +290,12 @@
 
 QString Prefs_KeyboardShortcuts::getKeyText(QKeySequence KeyC)
 {
-#ifdef USE_QT5
 	return KeyC.toString();
-#else
-	if ((KeyC & ~(Qt::META | Qt::CTRL | Qt::ALT | Qt::SHIFT)) == 0)
-		return "";
-	// on OSX Qt translates modifiers to forsaken symbols, arrows and the like
-	// we prefer plain English
-	QString res;
-	if ((KeyC & Qt::META) != 0)
-		res += "Meta+";
-	if ((KeyC & Qt::CTRL) != 0)
-		res += "Ctrl+";
-	if ((KeyC & Qt::ALT) != 0)
-		res += "Alt+";
-	if ((KeyC & Qt::SHIFT) != 0)
-		res += "Shift+";
-	return res + QString(QKeySequence(KeyC & ~(Qt::META | Qt::CTRL | Qt::ALT | Qt::SHIFT)));
-#endif
 }
 
 QString Prefs_KeyboardShortcuts::getTrKeyText(QKeySequence KeyC)
 {
-#ifdef USE_QT5
 	return KeyC.toString();
-#else
-	if ((KeyC & ~(Qt::META | Qt::CTRL | Qt::ALT | Qt::SHIFT)) == 0)
-		return "";
-	// on OSX Qt translates modifiers to forsaken symbols, arrows and the like
-	// we prefer plain English
-	QString res;
-	if ((KeyC & Qt::META) != 0)
-		res += CommonStrings::metaModifier + "+";
-	if ((KeyC & Qt::CTRL) != 0)
-		res += CommonStrings::controlModifier + "+";
-	if ((KeyC & Qt::ALT) != 0)
-		res += CommonStrings::altModifier + "+";
-	if ((KeyC & Qt::SHIFT) != 0)
-		res += CommonStrings::shiftModifier + "+";
-	return res + QString(QKeySequence(KeyC & ~(Qt::META | Qt::CTRL | Qt::ALT | Qt::SHIFT)));
-#endif
 }
 
 void Prefs_KeyboardShortcuts::setKeyText()
@@ -392,11 +358,7 @@
 			Q_CHECK_PTR(currLVI);
 			lviToActionMap.insert(currLVI, *it);
 			currLVI->setText(0, keyMap[*it].cleanMenuText);
-#ifdef USE_QT5
 			currLVI->setText(1, keyMap[*it].keySequence.toString());
-#else
-			currLVI->setText(1, keyMap[*it].keySequence);
-#endif
 			prevLVI=currLVI;
 		}
 	}
@@ -430,11 +392,7 @@
 			Q_CHECK_PTR(currLVI);
 			lviToActionMap.insert(currLVI, *it);
 			currLVI->setText(0, keyMap[*it].cleanMenuText);
-#ifdef USE_QT5
 			currLVI->setText(1, keyMap[*it].keySequence.toString());
-#else
-			currLVI->setText(1, keyMap[*it].keySequence);
-#endif
 			prevLVI=currLVI;
 		}
 	}
@@ -470,11 +428,7 @@
 		QString actionName=lviToActionMap[qlvi];
 		if (actionName.isEmpty())
 			return;
-#ifdef USE_QT5
 		keyDisplay->setText(keyMap[actionName].keySequence.toString());
-#else
-		keyDisplay->setText(keyMap[actionName].keySequence);
-#endif
 		if (keyMap[actionName].keySequence.isEmpty())
 			noKey->setChecked(true);
 		else
@@ -547,22 +501,13 @@
 												.arg(getTrKeyText(keyCode))
 												.arg(getAction(keyCode)),
 											CommonStrings::tr_OK);
-#ifdef USE_QT5
 					selectedLVI->setText(1,keyMap[lviToActionMap[selectedLVI]].keySequence.toString());
 					keyDisplay->setText(keyMap[lviToActionMap[selectedLVI]].keySequence.toString());
-#else
-					selectedLVI->setText(1,keyMap[lviToActionMap[selectedLVI]].keySequence);
-					keyDisplay->setText(keyMap[lviToActionMap[selectedLVI]].keySequence);
-#endif
 				}
 				else
 				{
 					QKeySequence newKeySequence(keyCode);
-#ifdef USE_QT5
 					selectedLVI->setText(1, newKeySequence.toString());
-#else
-					selectedLVI->setText(1, QString(newKeySequence));
-#endif
 					keyMap[lviToActionMap[selectedLVI]].keySequence=newKeySequence;
 					userDef->setChecked(true);
 				}

Modified: trunk/Scribus/scribus/ui/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/preview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preview.cpp (original)
+++ trunk/Scribus/scribus/ui/preview.cpp Tue Sep  3 20:00:22 2013
@@ -154,13 +154,8 @@
 		Table->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Separation Name")));
 		QHeaderView *header = Table->horizontalHeader();
 		header->setStretchLastSection(true);
-#ifdef USE_QT5
 		header->setSectionsMovable(false);
 		header->setSectionResizeMode(QHeaderView::Fixed);
-#else
-		header->setMovable(false);
-		header->setResizeMode(QHeaderView::Fixed);
-#endif
 		Table->setColumnWidth(0, 24);
 		Table->verticalHeader()->hide();
 		Table->setSelectionMode( QAbstractItemView::NoSelection );

Modified: trunk/Scribus/scribus/ui/replacecolors.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/replacecolors.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/replacecolors.cpp (original)
+++ trunk/Scribus/scribus/ui/replacecolors.cpp Tue Sep  3 20:00:22 2013
@@ -46,24 +46,13 @@
 	rgbIcon = loadIcon("rgb.png", true);
 	spotIcon = loadIcon("spot.png", true);
 	regIcon = loadIcon("register.png", true);
-#ifdef USE_QT5
 	replacementTable->horizontalHeader()->setSectionsClickable(false );
 	replacementTable->horizontalHeader()->setSectionsMovable( false );
 	replacementTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-#else
-	replacementTable->horizontalHeader()->setMovable(false);
-	replacementTable->horizontalHeader()->setClickable(false);
-	replacementTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
-#endif
 	replacementTable->setHorizontalHeaderItem(0, new QTableWidgetItem( tr("Original")));
 	replacementTable->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Replacement")));
-#ifdef USE_QT5
 	replacementTable->verticalHeader()->setSectionsMovable( false );
 	replacementTable->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-#else
-	replacementTable->verticalHeader()->setMovable(false);
-	replacementTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
-#endif
 	replacementTable->verticalHeader()->hide();
 	replacementTable->setIconSize(QSize(60, 15));
 	updateReplacementTable();

Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Tue Sep  3 20:00:22 2013
@@ -39,11 +39,7 @@
 #include "util.h"
 #include "util_icon.h"
 
-#ifdef USE_QT5
 ScDockPalette::ScDockPalette( QWidget * parent, const QString& prefsContext, Qt::WindowFlags f)
-#else
-ScDockPalette::ScDockPalette( QWidget * parent, const QString& prefsContext, Qt::WFlags f)
-#endif
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 	: QDockWidget ( parent, f | Qt::Tool  | Qt::CustomizeWindowHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint ),
 #else

Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h Tue Sep  3 20:00:22 2013
@@ -40,11 +40,7 @@
 	Q_OBJECT
 
 	public:
-#ifdef USE_QT5
 		ScDockPalette( QWidget * parent = NULL, const QString& prefsContext = QString::null, Qt::WindowFlags f = 0 );
-#else
-		ScDockPalette( QWidget * parent = NULL, const QString& prefsContext = QString::null, Qt::WFlags f = 0 );
-#endif
 		~ScDockPalette() {};
 		/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
 		//virtual void keyPressEvent(QKeyEvent *keyEvent);

Modified: trunk/Scribus/scribus/ui/scrpalettebase.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/scrpalettebase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.cpp (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.cpp Tue Sep  3 20:00:22 2013
@@ -38,20 +38,10 @@
 #include "util.h"
 #include "util_icon.h"
 
-#ifdef USE_QT5
 ScrPaletteBase::ScrPaletteBase(  QWidget * parent, const QString& prefsContext, bool modal, Qt::WindowFlags f)
-#else
-ScrPaletteBase::ScrPaletteBase(  QWidget * parent, const QString& prefsContext, bool modal, Qt::WFlags f)
-#endif
-#if QT_VERSION >= 0x040500
 	: QDialog ( parent, f | Qt::Tool | Qt::CustomizeWindowHint
 			| Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint
 			| Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint ),
-#else
-	: QDialog ( parent, f | Qt::Tool | Qt::CustomizeWindowHint
-			| Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint
-			| Qt::WindowSystemMenuHint | Qt::WindowType(0x08000000)),
-#endif
 	palettePrefs(0),
 	prefsContextName(QString::null),
 	visibleOnStartup(false)

Modified: trunk/Scribus/scribus/ui/scrpalettebase.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/scrpalettebase.h
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.h (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.h Tue Sep  3 20:00:22 2013
@@ -40,11 +40,7 @@
 	Q_OBJECT
 
 	public:
-#ifdef USE_QT5
 		ScrPaletteBase( QWidget * parent = NULL, const QString& prefsContext = QString::null, bool modal = false, Qt::WindowFlags f = 0 );
-#else
-		ScrPaletteBase( QWidget * parent = NULL, const QString& prefsContext = QString::null, bool modal = false, Qt::WFlags f = 0 );
-#endif
 		~ScrPaletteBase() {};
 		/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
 		//virtual void keyPressEvent(QKeyEvent *keyEvent);

Modified: trunk/Scribus/scribus/ui/sctreewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/sctreewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/sctreewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/sctreewidget.cpp Tue Sep  3 20:00:22 2013
@@ -99,11 +99,7 @@
 	setRootIsDecorated(false);
 	setIndentation(0);
 	header()->hide();
-#ifdef USE_QT5
 	header()->setSectionResizeMode(QHeaderView::Stretch);
-#else
-	header()->setResizeMode(QHeaderView::Stretch);
-#endif
 	viewport()->setBackgroundRole(QPalette::Window);
 	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 	m_toolbox_mode = false;

Modified: trunk/Scribus/scribus/ui/tablesideselector.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/tablesideselector.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tablesideselector.cpp (original)
+++ trunk/Scribus/scribus/ui/tablesideselector.cpp Tue Sep  3 20:00:22 2013
@@ -100,22 +100,14 @@
 
 void TableSideSelector::mousePressEvent(QMouseEvent* event)
 {
-#ifdef USE_QT5
 	m_selection ^= closestSide(event->localPos());
-#else
-	m_selection ^= closestSide(event->posF());
-#endif
 	update();
 	emit selectionChanged();
 }
 
 void TableSideSelector::mouseMoveEvent(QMouseEvent* event)
 {
-#ifdef USE_QT5
 	m_highlighted = closestSide(event->localPos());
-#else
-	m_highlighted = closestSide(event->posF());
-#endif
 	update();
 }
 

Modified: trunk/Scribus/scribus/ui/transparencypalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/transparencypalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.cpp (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.cpp Tue Sep  3 20:00:22 2013
@@ -581,14 +581,3 @@
 	currentUnit = unitIndex;
 }
 
-#ifndef USE_QT5
-void Tpalette::changeEvent(QEvent *e)
-{
-	if (e->type() == QEvent::LanguageChange)
-	{
-		languageChange();
-	}
-	else
-		QWidget::changeEvent(e);
-}
-#endif

Modified: trunk/Scribus/scribus/ui/transparencypalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/ui/transparencypalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.h (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.h Tue Sep  3 20:00:22 2013
@@ -58,10 +58,6 @@
 public:
 	Tpalette(QWidget* parent);
 	~Tpalette() {};
-
-#ifndef USE_QT5
-	virtual void changeEvent(QEvent *e);
-#endif
 
 	void setDocument(ScribusDoc* doc);
 	void setCurrentItem(PageItem* item);

Modified: trunk/Scribus/scribus/undogui.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/undogui.cpp
==============================================================================
--- trunk/Scribus/scribus/undogui.cpp (original)
+++ trunk/Scribus/scribus/undogui.cpp Tue Sep  3 20:00:22 2013
@@ -37,11 +37,7 @@
 #include "scraction.h"
 #include "util_icon.h"
 
-#ifdef USE_QT5
 UndoGui::UndoGui(QWidget* parent, const char* name, Qt::WindowFlags f) : ScDockPalette(parent, name, f)
-#else
-UndoGui::UndoGui(QWidget* parent, const char* name, Qt::WFlags f) : ScDockPalette(parent, name, f)
-#endif
 {
 	setWindowTitle( tr("Action History"));
 }

Modified: trunk/Scribus/scribus/undogui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18446&path=/trunk/Scribus/scribus/undogui.h
==============================================================================
--- trunk/Scribus/scribus/undogui.h (original)
+++ trunk/Scribus/scribus/undogui.h Tue Sep  3 20:00:22 2013
@@ -67,11 +67,7 @@
 	 * @param name Name of the object
 	 * @param f widget flags
 	 */
-#ifdef USE_QT5
 	UndoGui(QWidget* parent = 0, const char* name = "UndoGui", Qt::WindowFlags f = 0);
-#else
-	UndoGui(QWidget* parent = 0, const char* name = "UndoGui", Qt::WFlags f = 0);
-#endif
 
 	/** @brief Destroys the widget */
 	virtual ~UndoGui() {};




More information about the scribus-commit mailing list