Merge branch 'buildsystem' into next

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45d37d452a5844276802b1310f4cc527d1b39dc9..95d78dcd4728a39d3edfec02faaae1ffdead5dfd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ set(KDENLIVE_VERSION 0.8.3)
 
 # Minimum versions of main dependencies.
 set(LIBMLT_MIN_VERSION 0.7.6)
-set(QT_MIN_VERSION 4.6.0)
-set(KDE_MIN_VERSION 4.4.0)
+set(QT_MIN_VERSION 4.5.0)
+set(KDE_MIN_VERSION 4.3.0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
@@ -58,16 +58,8 @@ macro_log_feature(KDE4_FOUND
   ${KDE_MIN_VERSION}
 )
 
-# Find Qt core modules (QtCore and QtGui are searched by default).
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtDBus)
-macro_log_feature(QT_QTDBUS_FOUND
-  "QtDBus"
-  "Qt bindings for the D-Bus library"
-  "http://qt.nokia.com/products/qt"
-  TRUE
-  ${QT_MIN_VERSION}
-  "QtDBus library (most likely called libqt4-dbus)"
-)
+# Find Qt core modules.
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtCore QtDBus)
 
 # Search MLT package.
 find_package(LIBMLT REQUIRED)

diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt
index c6513b286a5c3f9303613a520533ee14a1f6a7b9..744cdf653eaf0bafccf59410212e3dcbe8478d80 100644 (file)
--- a/renderer/CMakeLists.txt
+++ b/renderer/CMakeLists.txt
@@ -1,29 +1,20 @@
+# Check src/CMakeLists.txt for detailed comments on the contents of this file.
 
-
-include_directories (
-    ${QDBUS_INCLUDE_DIRS}
-    ${KDE4_INCLUDES}
-    ${CMAKE_SOURCE_DIR} 
-    ${CMAKE_BINARY_DIR} 
-)
-
-LINK_LIBRARIES(
-${LIBMLT_LIBRARY}
-${LIBMLTPLUS_LIBRARY}
-${optional_libs}
-)
-
-set(kdenlive_render_SRCS 
+set(kdenlive_render_SRCS
   kdenlive_render.cpp
   renderjob.cpp
 )
 
 kde4_add_executable(kdenlive_render ${kdenlive_render_SRCS})
 
-target_link_libraries(kdenlive_render 
-  ${QT_QTCORE_LIBRARY}
-  ${QT_QTDBUS_LIBRARY}
+include_directories(
+    ${QT_INCLUDES}
 )
 
-install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})
+include(${QT_USE_FILE})
+
+target_link_libraries(kdenlive_render
+  ${QT_LIBRARIES}
+)
 
+install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb73bbd6b33376d939fa5177b80fd3998e421799..f5b877eb9bf566bb20c42c3fa68f8ee7242eab11 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 find_package(OpenGL REQUIRED)
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtOpenGL QtScript)
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtGui QtOpenGL QtScript)
 if(APPLE)
   find_package(SDL REQUIRED)
 endif(APPLE)
@@ -281,21 +281,26 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99")
 add_definitions(${KDE4_DEFINITIONS})
 
 include_directories(
+  ${CMAKE_BINARY_DIR}
   ${KDE4_INCLUDES} # Adds Qt include directories too.
   ${LIBMLT_INCLUDE_DIR}
   ${LIBMLTPLUS_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 # Adds Qt definitions and include directories, and sets QT_LIBRARIES according
 # to the components requested in find_package().
-include(UseQt4)
+include(${QT_USE_FILE})
+
+if(${KDE_VERSION} VERSION_LESS 4.3.80)
+  set(KDE4_KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF2_LIBS})
+else(${KDE_VERSION} VERSION_LESS 4.3.80)
+  set(KDE4_KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF3_LIBS})
+endif(${KDE_VERSION} VERSION_LESS 4.3.80)
 
 target_link_libraries(kdenlive
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
-  ${KDE4_KNEWSTUFF3_LIBS}
+  ${KDE4_KNEWSTUFF_LIBS}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
   ${KDE4_KROSSUI_LIBS}
   ${QT_LIBRARIES}

diff --git a/src/archivewidget.cpp b/src/archivewidget.cpp
index 363781df6423abef52f85f0cde8c52e71ce24da4..db2b9e8db2c6d033c1db1f17a42db70beb343ad0 100644 (file)
--- a/src/archivewidget.cpp
+++ b/src/archivewidget.cpp
@@ -140,9 +140,7 @@ ArchiveWidget::ArchiveWidget(QString projectName, QDomDocument doc, QList <DocCl
     generateItems(others, otherUrls);
     generateItems(proxies, proxyUrls);
     
-#if QT_VERSION >= 0x040500
     allFonts.removeDuplicates();
-#endif
 
     //TODO: fonts
 

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 35b11c21c9910934a8899d04f904da7d742f2ee8..f5e7d91acae8ea22e4b6f0a266b5950375a58ba6 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -6420,9 +6420,7 @@ QStringList CustomTrackView::extractTransitionsLumas()
             if (!luma.isEmpty()) urls << KUrl(luma).path();
         }
     }
-#if QT_VERSION >= 0x040500
     urls.removeDuplicates();
-#endif
     return urls;
 }
 

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 520501e5069191995bcf1f966ffa5acaf2d93bd8..34297068c8e61ff847ac971ade8d10fabbb2b8fe 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -713,7 +713,6 @@ void KdenliveSettingsDialog::updateSettings()
 #endif
 
     KConfigDialog::settingsChangedSlot();
-
     //KConfigDialog::updateSettings();
     if (resetProfile) emit doResetProfile();
 }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5982d3024a143a93ef807e3144e37f012a18b83b..d9f6c403823d3cb56a92700130107de6b4f01df9 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -92,8 +92,14 @@
 #include <KFileItem>
 #include <KNotification>
 #include <KNotifyConfigWidget>
+#if KDE_IS_VERSION(4,3,80)
 #include <knewstuff3/downloaddialog.h>
 #include <knewstuff3/knewstuffaction.h>
+#else
+#include <knewstuff2/engine.h>
+#include <knewstuff2/ui/knewstuffaction.h>
+#define KNS3 KNS
+#endif
 #include <KToolBar>
 #include <KColorScheme>
 #include <KProgressDialog>
@@ -239,7 +245,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
     connect(m_notesWidget, SIGNAL(seekProject(int)), m_projectMonitor->render, SLOT(seekToFrame(int)));
     
     m_notesWidget->setTabChangesFocus(true);
+#if KDE_IS_VERSION(4,4,0)
     m_notesWidget->setClickMessage(i18n("Enter your project notes here ..."));
+#endif
     m_notesDock->setWidget(m_notesWidget);
     addDockWidget(Qt::TopDockWidgetArea, m_notesDock);
 
@@ -3661,6 +3669,7 @@ void MainWindow::slotResizeItemEnd()
 int MainWindow::getNewStuff(const QString &configFile)
 {
     KNS3::Entry::List entries;
+#if KDE_IS_VERSION(4,3,80)
     KNS3::DownloadDialog dialog(configFile);
     dialog.exec();
     entries = dialog.changedEntries();
@@ -3668,6 +3677,15 @@ int MainWindow::getNewStuff(const QString &configFile)
         if (entry.status() == KNS3::Entry::Installed)
             kDebug() << "// Installed files: " << entry.installedFiles();
     }
+#else
+    KNS::Engine engine(0);
+    if (engine.init(configFile))
+        entries = engine.downloadDialogModal(this);
+    foreach(KNS::Entry * entry, entries) {
+        if (entry->status() == KNS::Entry::Installed)
+            kDebug() << "// Installed files: " << entry->installedFiles();
+    }
+#endif
     return entries.size();
 }
 

diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp
index bce75275d7ac0f46bdaf6e359154124c8fd5e1c0..0504ba827552e0af64caa4553c26606a192fec7d 100644 (file)
--- a/src/projectsettings.cpp
+++ b/src/projectsettings.cpp
@@ -298,9 +298,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly)
             usedSize += clip->fileSize();
         }
     }
-#if QT_VERSION >= 0x040500
     allFonts.removeDuplicates();
-#endif
     // Hide unused categories
     for (int i = 0; i < files_list->topLevelItemCount(); i++) {
         if (files_list->topLevelItem(i)->childCount() == 0) {

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 3e7d4323641ce87e9d7eeb719c0584b25c9ab21d..9ec0c44257d70bde6ec5e3507112097dbadaa96d 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -35,9 +35,7 @@
 #include <KFileItem>
 #include <KMessageBox>
 #include <KApplication>
-
 #include <KDiskFreeSpaceInfo>
-
 #include <QMouseEvent>
 #include <QMenu>
 #include <QToolButton>

diff --git a/src/recmonitor.h b/src/recmonitor.h
index ec25a73c556d681beb9aa871d596ee447a0eb5dd..86cb0d97e286986f1894bc38b91f030fb32d28c6 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -40,7 +40,6 @@
 #include <KDateTime>
 #include <kdeversion.h>
 #include <KComboBox>
-
 #include <kcapacitybar.h>
 
 class MonitorManager;