Merge branch 'master' of http://github.com/lopespt/QtSortingAlgorithms

lopespt · May 14, 2018 · fa454c3 · fa454c3
2 parents 8d1b6ba + e62343f
commit fa454c3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,12 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
 
 PROJECT(QtSortingAlgorithms)
 
+FIND_PACKAGE(Qt5Core)
 FIND_PACKAGE(Qt5Widgets)
 FIND_PACKAGE(Qt5OpenGL)
 
-IF(APPLE)
-    INCLUDE_DIRECTORIES("/Applications/Xcode.app/Contents/Developer/Toolchains//XcodeDefault.xctoolchain/usr/include/c++/v1/")
-ENDIF(APPLE)
+#IF(APPLE)
+ #   INCLUDE_DIRECTORIES("/Applications/Xcode.app/Contents/Developer/Toolchains//XcodeDefault.xctoolchain/usr/include/c++/v1/")
+#ENDIF(APPLE)
 
 INCLUDE_DIRECTORIES("${Qt5Widgets_INCLUDES} ${Qt5OpenGL_INCLUDES}")
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)

diff --git a/VectorSorter.h b/VectorSorter.h
@@ -1,7 +1,6 @@
 #ifndef VECTORSORTER_H
 #define VECTORSORTER_H
 
-#include <QObject>
 #include <QVector>
 #include <QThread>
 #include <QDebug>

diff --git a/tags/QtSortingAlgorithms.tags b/tags/QtSortingAlgorithms.tags