diff --git a/CMakeLists.txt b/CMakeLists.txt index 690bbe498..a3d1ea099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ else (WIN32 OR APPLE) option(ENABLE_LIBVLC "Use libVLC for MPD HTTP stream playback (if ENABLE_HTTP_STREAM_PLAYBACK=ON)" ON) endif (WIN32 OR APPLE) option(ENABLE_KDE "Enable KDE libraries" OFF) -option(ENABLE_QT5 "Build against Qt5" OFF) +option(ENABLE_QT5 "Build against Qt5" ON) option(ENABLE_UBUNTU "Build for the Ubuntu SDK" OFF) option(ENABLE_UBUNTU_COMMAND_LINE "Build for the Ubuntu SDK from the command line" OFF) option(ENABLE_FFMPEG "Enable ffmpeg/libav libraries (required for replaygain calculation)" ON) @@ -132,9 +132,9 @@ if (ENABLE_UBUNTU) set(USE_SYSTEM_MENU_ICON OFF) endif (ENABLE_UBUNTU) -if (ENABLE_QT5) - set(ENABLE_KDE OFF) -endif (ENABLE_QT5) +if (ENABLE_KDE) + set(ENABLE_QT5 OFF) +endif (ENABLE_KDE) if (NOT WIN32 AND NOT APPLE AND ENABLE_DEVICES_SUPPORT AND ENABLE_UDISKS2) set(WITH_SOLID_UDISKS2 ON) diff --git a/ChangeLog b/ChangeLog index 240ca44ae..8dcd49638 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ save in the cache folder. 60. Build with HTTP stream playback enabled by default. 61. Use LibVLC by default for MPD HTTP stream playback on Linux. +62. Default to Qt5 builds. 1.5.2 ----- diff --git a/INSTALL b/INSTALL index c6c332f5e..41832a833 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ Qt4 --- 1. mkdir build 2. cd build -3. cmake .. +3. cmake .. -DENABLE_QT5=OFF 4. make 5. sudo make install @@ -13,7 +13,7 @@ Qt5 --- 1. mkdir build 2. cd build -3. cmake .. -DENABLE_QT5=ON +3. cmake 4. make 5. sudo make install @@ -34,6 +34,10 @@ Ubuntu **NOTE: No longer actively maintained** 5. make install 6. click build click +Mac/Windows +----------- +See README + CMake Options ============= @@ -94,7 +98,7 @@ The following options may be passed to CMake: -DENABLE_QT5=ON Build against Qt5, not Qt4 - Default: OFF + Default: ON -DENABLE_PROXY_CONFIG=ON Enable support for proxy settings in config dialog. If disabled, diff --git a/README b/README index 86bc2f818..52cf27e40 100644 --- a/README +++ b/README @@ -931,7 +931,7 @@ s PATH=z:\dev\Qt\5.3\mingw482_32\bin;z:\dev\Qt\Tools\mingw482_32\bin;z:\dev\taglib\bin;z:\dev\cmake\bin 3. Load cantata's CMakeLists.txt in QtCreator, and pass the following to cmake: - ../src -DCMAKE_BUILD_TYPE=Release -DENABLE_TAGLIB=OFF -DTAGLIB_FOUND=1 -DTAGLIB_INCLUDES=z:/dev/taglib/include -DTAGLIB_LIBRARIES=z:/dev/taglib/lib/libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1 -DTAGLIB_CAN_SAVE_ID3VER=1 -DZLIB_INCLUDE_DIR=z:/dev/zlib/include -DZLIB_LIBRARY=z:/dev/zlib/lib/libz.dll.a -DCMAKE_INSTALL_PREFIX=z:/cantata/install -DCANTATA_WINDOWS_INSTALLER_DEST=z:/cantata -DENABLE_QT5=ON -DCANTATA_SSL_LIBS=z:/dev/ssl/libeay32.dll;z:/dev/ssl/ssleay32.dll + ../src -DCMAKE_BUILD_TYPE=Release -DENABLE_TAGLIB=OFF -DTAGLIB_FOUND=1 -DTAGLIB_INCLUDES=z:/dev/taglib/include -DTAGLIB_LIBRARIES=z:/dev/taglib/lib/libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1 -DTAGLIB_CAN_SAVE_ID3VER=1 -DZLIB_INCLUDE_DIR=z:/dev/zlib/include -DZLIB_LIBRARY=z:/dev/zlib/lib/libz.dll.a -DCMAKE_INSTALL_PREFIX=z:/cantata/install -DCANTATA_WINDOWS_INSTALLER_DEST=z:/cantata -DCANTATA_SSL_LIBS=z:/dev/ssl/libeay32.dll;z:/dev/ssl/ssleay32.dll Notes: -DENABLE_TAGLIB=OFF stops cmake from trying to find TagLib, as the TagLib settings have been manually set,