r21752 by jghali - remove for now QtQml/QtQuick dependency only used by test code

[scribus-commit]

Author: jghali
Date: Sun Feb  5 01:42:46 2017
New Revision: 21752

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21752
Log:
remove for now QtQml/QtQuick dependency only used by test code

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21752&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Feb  5 01:42:46 2017
@@ -643,12 +643,12 @@
 else()
     message(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
 endif()
-find_package(Qt5Quick REQUIRED)
-if(Qt5Quick_FOUND)
-    message(STATUS "----- USE Qt5Quick -----")
-else()
-    message(FATAL_ERROR "ERROR: No Qt5Quick found")
-endif()
+#find_package(Qt5Quick REQUIRED)
+#if(Qt5Quick_FOUND)
+#    message(STATUS "----- USE Qt5Quick -----")
+#else()
+#    message(FATAL_ERROR "ERROR: No Qt5Quick found")
+#endif()
 find_package(Qt5PrintSupport REQUIRED)
 if(Qt5PrintSupport_FOUND)
     message(STATUS "----- USE Qt5PrintSupport -----")
@@ -667,8 +667,8 @@
 add_definitions(${Qt5Network_DEFINITIONS})
 include_directories(${Qt5OpenGL_INCLUDE_DIRS})
 add_definitions(${Qt5OpenGL_DEFINITIONS})
-include_directories(${Qt5Quick_INCLUDE_DIRS})
-add_definitions(${Qt5Quick_DEFINITIONS})
+#include_directories(${Qt5Quick_INCLUDE_DIRS})
+#add_definitions(${Qt5Quick_DEFINITIONS})
 include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
 add_definitions(${Qt5PrintSupport_DEFINITIONS})
 

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21752&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Sun Feb  5 01:42:46 2017
@@ -1226,12 +1226,10 @@
 	${Qt5Widgets_LIBRARIES}
 	${Qt5Gui_LIBRARIES}
 	${Qt5Xml_LIBRARIES}
-	${Qt5WebKit_LIBRARIES}
-	${Qt5WebKitWidgets_LIBRARIES}
 	${Qt5Network_LIBRARIES}
 	${Qt5OpenGL_LIBRARIES}
 	${Qt5PrintSupport_LIBRARIES}
-	${Qt5Quick_LIBRARIES}
+#	${Qt5Quick_LIBRARIES}
 	${CUPS_LIBRARIES}
 	${FREETYPE_LIBRARIES}
 	${HARFBUZZ_LIBRARIES}
@@ -1329,8 +1327,6 @@
 	${Qt5Widgets_LIBRARIES}
 	${Qt5Gui_LIBRARIES}
 	${Qt5Xml_LIBRARIES}
-	${Qt5WebKit_LIBRARIES}
-	${Qt5WebKitWidgets_LIBRARIES}
 	${Qt5Network_LIBRARIES}
 	${Qt5OpenGL_LIBRARIES}
 	${LIBXML2_LIBRARIES}

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21752&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sun Feb  5 01:42:46 2017
@@ -37,6 +37,7 @@
 #include <QFileDialog>
 #include <QFrame>
 #include <QFont>
+#include <QHBoxLayout>
 #include <QIcon>
 #include <QInputDialog>
 #include <QKeyEvent>
@@ -52,12 +53,11 @@
 #include <QProgressBar>
 #include <QPushButton>
 //<<QML testing
-#include <QHBoxLayout>
-#include <QQuickView>
-#include <QQmlEngine>
-#include <QQmlComponent>
-#include <QQuickItem>
-#include <QQmlProperty>
+//#include <QQuickView>
+//#include <QQmlEngine>
+//#include <QQmlComponent>
+//#include <QQuickItem>
+//#include <QQmlProperty>
 //>>
 #include <QRegExp>
 #include <QScopedPointer>
@@ -9997,7 +9997,7 @@
 }
 
 
-void ScribusMainWindow::testQTQuick2_1()
+/*void ScribusMainWindow::testQTQuick2_1()
 {
 	qDebug()<<"Testing Qt Quick 2.0";
 
@@ -10042,7 +10042,7 @@
 	}
 	m_qqview->close();
 	m_qqview->deleteLater();
-}
+}*/
 
 void ScribusMainWindow::changePreviewQuality(int index)
 {

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21752&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h	(original)
+++ trunk/Scribus/scribus/scribus.h	Sun Feb  5 01:42:46 2017
@@ -566,11 +566,11 @@
 	//connected to signal emitted by actions when "Update Marks" menu item is triggered
 	void slotUpdateMarks();
 	bool editMarkDlg(Mark *mrk, PageItem_TextFrame* currItem = NULL);
-	void testQTQuick2_1();
-	void testQT_slot1(QString);
-	void testQT_slot2(double);
-	void testQT_slot3(int);
-	void testQT_slot4();
+//	void testQTQuick2_1();
+//	void testQT_slot1(QString);
+//	void testQT_slot2(double);
+//	void testQT_slot3(int);
+//	void testQT_slot4();
 	void changePreviewQuality(int index);
 	void enablePalettes(bool b);
 	void ToggleFrameEdit();
@@ -666,7 +666,7 @@
 	bool m_WasAutoSave;
 	bool m_pagePalVisible;
 
-	QQuickView *m_qqview;
+	//QQuickView *m_qqview;
 };
 
 #endif