From fd1e3bb814ca73744a9837b50b947a71de907c45 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 13 Mar 2013 13:42:41 -0500 Subject: [PATCH] Fixed issues with libGroupView on Windows. --- libgroupview/CMakeLists.txt | 4 ++-- libgroupview/include/kcategorizedsortfilterproxymodel.h | 5 +++-- libgroupview/include/kcategorizedview.h | 5 +++-- libgroupview/src/kcategorizedview.cpp | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libgroupview/CMakeLists.txt b/libgroupview/CMakeLists.txt index 9aa3013b..c53988a0 100644 --- a/libgroupview/CMakeLists.txt +++ b/libgroupview/CMakeLists.txt @@ -4,7 +4,7 @@ set(CMAKE_AUTOMOC ON) # Find Qt find_package(Qt5Core REQUIRED) -find_package(Qt5Gui REQUIRED) +find_package(Qt5Widgets REQUIRED) # Include Qt headers. include_directories(${Qt5Base_INCLUDE_DIRS}) @@ -38,4 +38,4 @@ include_directories(${CMAKE_BINARY_DIR}/include) add_definitions(-DLIBGROUPVIEW_LIBRARY) add_library(libGroupView SHARED ${LIBGROUPVIEW_SOURCES} ${LIBGROUPVIEW_HEADERS}) -qt5_use_modules(libGroupView Core Gui) +qt5_use_modules(libGroupView Core Widgets) diff --git a/libgroupview/include/kcategorizedsortfilterproxymodel.h b/libgroupview/include/kcategorizedsortfilterproxymodel.h index be83f3be..df1be736 100644 --- a/libgroupview/include/kcategorizedsortfilterproxymodel.h +++ b/libgroupview/include/kcategorizedsortfilterproxymodel.h @@ -24,7 +24,8 @@ #include -#include +//#include +#include class QItemSelection; @@ -42,7 +43,7 @@ class QItemSelection; * * @author Rafael Fernández López */ -class KDEUI_EXPORT KCategorizedSortFilterProxyModel +class LIBGROUPVIEW_EXPORT KCategorizedSortFilterProxyModel : public QSortFilterProxyModel { public: diff --git a/libgroupview/include/kcategorizedview.h b/libgroupview/include/kcategorizedview.h index 04c2f5cc..df962131 100644 --- a/libgroupview/include/kcategorizedview.h +++ b/libgroupview/include/kcategorizedview.h @@ -23,7 +23,8 @@ #include -#include +//#include +#include class KCategoryDrawer; @@ -75,7 +76,7 @@ class KCategoryDrawer; * * @author Rafael Fernández López */ -class KDEUI_EXPORT KCategorizedView +class LIBGROUPVIEW_EXPORT KCategorizedView : public QListView { Q_OBJECT diff --git a/libgroupview/src/kcategorizedview.cpp b/libgroupview/src/kcategorizedview.cpp index ba4ae2dc..5b7c8d42 100644 --- a/libgroupview/src/kcategorizedview.cpp +++ b/libgroupview/src/kcategorizedview.cpp @@ -33,7 +33,7 @@ #include "kcategorizedview_p.h" #include // trunc on C99 compliant systems -#include // trunc for not C99 compliant systems +//#include // trunc for not C99 compliant systems #include #include