Merge pull request #4896 from Chocobozzz/qt5

[Qt5] Fix release compilation and set cmake min version to 2.8.11

3rdparty/fancytabwidget/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(SOURCES
   fancytabwidget.cpp

3rdparty/libmygpo-qt5/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 2.6 FATAL_ERROR )
+cmake_minimum_required( VERSION 2.8.11 FATAL_ERROR )
 
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )

3rdparty/qsqlite/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 add_definitions(-DQT_STATICPLUGIN)
 

3rdparty/qtiocompressor/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(IOCOMPRESSOR-SOURCES
     qtiocompressor.cpp

3rdparty/qtsingleapplication/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(SINGLEAPP-SOURCES
     qtlocalpeer.cpp

3rdparty/qtwin/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(QTWIN-SOURCES
     qtwin.cpp

3rdparty/qxt/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(QXT-SOURCES
   qxtglobal.cpp

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 cmake_policy(SET CMP0011 OLD)
 
 include(CheckCXXCompilerFlag)
@@ -140,6 +140,7 @@ find_package(Threads)
 if(${CMAKE_BUILD_TYPE} MATCHES "Release")
   add_definitions(-DNDEBUG)
   add_definitions(-DQT_NO_DEBUG_OUTPUT)
+  add_definitions(-DQT_NO_WARNING_OUTPUT)
 endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
 
 # Set up definitions and paths

ext/libclementine-common/core/logging.h

@@ -27,11 +27,16 @@
 #define qLog(level) \
   while (false) QNoDebug()
 #else
-#define qLog(level)                                                        \
+
+#define qLog(level) \
+  logging::CreateLogger##level()
+
+#define qCreateLogger(level) \
   logging::CreateLogger(logging::Level_##level,                            \
                         logging::ParsePrettyFunction(__PRETTY_FUNCTION__), \
                         __LINE__)
-#endif
+
+#endif // QT_NO_DEBUG_STREAM
 
 namespace logging {
 class NullDevice : public QIODevice {
@@ -56,6 +61,24 @@ void DumpStackTrace();
 QString ParsePrettyFunction(const char* pretty_function);
 QDebug CreateLogger(Level level, const QString& class_name, int line);
 
+QDebug CreateLoggerFatal() { return qCreateLogger(Fatal); }
+QDebug CreateLoggerError() { return qCreateLogger(Error); }
+
+#ifdef QT_NO_WARNING_OUTPUT
+QNoDebug CreateLoggerWarning() { return QNoDebug(); }
+#else
+QDebug CreateLoggerWarning() { return qCreateLogger(Warning); }
+#endif // QT_NO_WARNING_OUTPUT
+
+#ifdef QT_NO_DEBUG_OUTPUT
+QNoDebug CreateLoggerInfo() { return QNoDebug(); }
+QNoDebug CreateLoggerDebug() { return QNoDebug(); }
+#else
+QDebug CreateLoggerInfo() { return qCreateLogger(Info); }
+QDebug CreateLoggerDebug() { return qCreateLogger(Debug); }
+#endif // QT_NO_DEBUG_OUTPUT
+
+
 void GLog(const char* domain, int level, const char* message, void* user_data);
 
 extern const char* kDefaultLogLevels;

gst/moodbar/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(CMAKE_C_FLAGS "-Wall")
 set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x")

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")
 

tools/ultimate_lyrics_parser/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare ${CMAKE_CXX_FLAGS}")