fix build after merge

rodlie · Mar 18, 2022 · d4c7dfe · d4c7dfe
1 parent 6dfaaec
commit d4c7dfe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@
 cmake_minimum_required(VERSION 3.1)
 enable_testing()
 
-project(Cyan VERSION 1.2.99)
+project(Cyan VERSION 1.2.99.1)
 
 if(NOT PROJECT_VERSION_TWEAK)
     set(PROJECT_VERSION_TWEAK 0)
@@ -45,9 +45,9 @@ add_definitions(-DCYAN_VERSION="${PROJECT_VERSION}")
 add_definitions(-DCYAN_GIT="$ENV{GIT}")
 
 set(MAGICK_PKG_CONFIG "Magick++" CACHE STRING "ImageMagick pkg-config name")
-set(SOURCES src/main.cpp src/cyan.cpp src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/FXX.cpp res/cyan.qrc docs/docs.qrc)
+set(SOURCES src/main.cpp src/cyan.cpp src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/FXX.cpp)
 set(HEADERS src/cyan.h src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/FXX.h)
-set(RESOURCE_FILES res/cyan.qrc docs/docs.qrc)
+set(RESOURCES_FILES res/cyan.qrc docs/docs.qrc)
 set(RESOURCE_FOLDER res)
 
 set(TEST_SOURCES src/tst_cyan.cpp src/FXX.cpp res/tests.qrc)
@@ -80,14 +80,12 @@ endif()
 
 find_package(Qt5 5.9 REQUIRED Core Gui Widgets Concurrent Test)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../lib/cmake/modules/")
-
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 
-option(DEPLOY "Deploy" OFF)
-option(USE_PKG_CONFIG "Use pkg-config" ON)
-option(USE_Q32 "Q32 workaround if not using pkg-config" OFF)
+option(BUNDLE_FONT "Bundle font (DejvuSans) with application. Need for static Qt builds" OFF)
+option(DEPLOY "Deploy option used for official binaries" OFF)
+option(USE_PKG_CONFIG "Use pkg-config to find third-party dependencies" ON)
 
 if(DEPLOY)
     if(MINGW OR APPLE)
@@ -135,16 +133,8 @@ if(USE_PKG_CONFIG)
         target_link_libraries(tests ${MAGICK_LIBRARIES} ${LCMS2_LIBRARIES} ${MAGICK_LDFLAGS} ${LCMS2_LDFLAGS})
     endif()
 else()
-    target_link_libraries(${PROJECT_NAME} ${LCMS2_LIBRARY})
-    target_link_libraries(${PROJECT_NAME} ${ImageMagick_LIBRARIES})
-    target_link_libraries(${PROJECT_NAME} ${ImageMagick_MagickCore_LIBRARIES})
-    target_link_libraries(${PROJECT_NAME} ${ImageMagick_MagickWand_LIBRARIES})
-    target_link_libraries(${PROJECT_NAME} ${ImageMagick_Magick++_LIBRARIES})
-    target_link_libraries(tests ${LCMS2_LIBRARY})
-    target_link_libraries(tests ${ImageMagick_LIBRARIES})
-    target_link_libraries(tests ${ImageMagick_MagickCore_LIBRARIES})
-    target_link_libraries(tests ${ImageMagick_MagickWand_LIBRARIES})
-    target_link_libraries(tests ${ImageMagick_Magick++_LIBRARIES})
+    target_link_libraries(${PROJECT_NAME} ${LCMS2_LIBRARY} ${ImageMagick_LIBRARIES} ${ImageMagick_MagickCore_LIBRARIES} ${ImageMagick_MagickWand_LIBRARIES} ${ImageMagick_Magick++_LIBRARIES})
+    target_link_libraries(tests ${LCMS2_LIBRARY} ${ImageMagick_LIBRARIES} ${ImageMagick_MagickCore_LIBRARIES} ${ImageMagick_MagickWand_LIBRARIES} ${ImageMagick_Magick++_LIBRARIES})
 endif()
 
 add_test(NAME tests COMMAND tests)

diff --git a/cyan.pro b/cyan.pro
@@ -31,7 +31,7 @@
 # USED FOR OFFICIAL BINARIES, USE CMAKE INSTEAD!
 
 TARGET = Cyan
-VERSION = 1.2.99
+VERSION = 1.2.99.1
 
 SOURCES += \
     src/main.cpp \

diff --git a/src/cyan.cpp b/src/cyan.cpp
@@ -53,6 +53,7 @@
 #include <QMimeData>
 #include <QMimeDatabase>
 #include <QMimeType>
+#include <QTreeWidgetItem>
 #include <qtconcurrentrun.h>
 
 #ifdef Q_OS_WIN
@@ -1382,12 +1383,12 @@ int Cyan::supportedDepth()
 void Cyan::clearImageBuffer()
 {
     fx.clearImage(imageData);
-    imageInfoTree->clear();
+    //imageInfoTree->clear();
 }
 
 void Cyan::parseImageInfo()
 {
-    QString info = QString::fromStdString(imageData.info);
+    /*QString info = QString::fromStdString(imageData.info);
     if (!info.isEmpty()) {
         imageInfoTree->clear();
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -1461,7 +1462,7 @@ void Cyan::parseImageInfo()
         imageInfoTree->addTopLevelItems(level1items.toList());
         level2items.clear();
         imageInfoTree->expandAll();
-    }
+    }*/
 }
 
 QMap<QString, QString> Cyan::genProfiles(FXX::ColorSpace colorspace)

diff --git a/src/cyan.h b/src/cyan.h
@@ -180,6 +180,7 @@ private slots:
 
     int supportedDepth();
     void clearImageBuffer();
+    void parseImageInfo();
 
     QMap<QString,QString> genProfiles(FXX::ColorSpace colorspace);
     QByteArray getDefaultProfile(FXX::ColorSpace colorspace);