Adjusted .pro files to support Linux and Qt 5.0

karlphillip · karlphillip · commit 1cf38ed3f1ff · 2013-02-17T11:25:55.000-03:00
diff --git a/IngressLogoGL/GLwindow.cpp b/IngressLogoGL/GLwindow.cpp
@@ -8,7 +8,9 @@
  */
 #include "GLwindow.h"
 
+#include <GL/glu.h>
 #include <iostream>
+
 #include <QKeyEvent>
 #include <QTimer>
 
diff --git a/IngressLogoGL/ingress_logo.pro b/IngressLogoGL/ingress_logo.pro
@@ -1,5 +1,18 @@
 QT += core opengl
 
+contains(QT_VERSION, ^5\\.[0-8]\\..*) {
+	message("* Using Qt $${QT_VERSION}.")
+	QT += widgets
+
+	# On my system I have to specify g++ as compiler else it will use clang++ by default
+	QMAKE_CXX=g++
+	QMAKE_CC=gcc
+}
+
+unix {
+	INCLUDEPATH += /usr/X11/include 
+} 
+
 SOURCES += \
     main.cpp \
     GLwindow.cpp
diff --git a/cvImage/cvImage.cpp b/cvImage/cvImage.cpp
@@ -73,7 +73,7 @@ void cvImage::_open()
     _image = new QImage(img.size().width, img.size().height, QImage::Format_RGB888);
 
     // Copy cv::Mat to QImage
-    qMemCopy(_image->scanLine(0), (unsigned char*)img.data, _image->width() * _image->height() * img.channels());
+    memcpy(_image->scanLine(0), (unsigned char*)img.data, _image->width() * _image->height() * img.channels());
 
     // Set the filename as the window title
     setWindowTitle(filename);
diff --git a/cvImage/cvImage.pro b/cvImage/cvImage.pro
@@ -2,15 +2,36 @@ TEMPLATE = app
 
 QT      += core gui
 
+contains(QT_VERSION, ^5\\.[0-8]\\..*) {
+	message("* Using Qt $${QT_VERSION}.")
+	QT += widgets
+
+	# On my system I have to specify g++ as compiler else it will use clang++ by default
+	#QMAKE_CXX=g++
+	#QMAKE_CC=gcc
+}
+
 SOURCES += \
     main.cpp \
     cvImage.cpp
 
 HEADERS += \
     cvImage.h
 
+## OpenCV settings for Unix/Linux
+unix:!mac {
+	message("* Using settings for Unix/Linux.")
+    INCLUDEPATH += /usr/local/include/opencv
+
+    LIBS += -L/usr/local/lib/ \
+        -lopencv_core \
+        -lopencv_highgui \
+        -lopencv_imgproc
+}
+
 ## OpenCV settings for Mac OS X
 macx {
+	message("* Using settings for Mac OS X.")
     INCLUDEPATH += /usr/local/include/opencv
 
     LIBS += -L/usr/local/lib/ \
@@ -21,6 +42,7 @@ macx {
 
 ## OpenCV settings for Windows and OpenCV 2.4.2
 win32 {
+	message("* Using settings for Windows.")
     INCLUDEPATH += "C:\\opencv\\build\\include" \
                    "C:\\opencv\\build\\include\\opencv" \
                    "C:\\opencv\\build\\include\\opencv2"
diff --git a/cvVideo/cvVideo.pro b/cvVideo/cvVideo.pro
@@ -2,15 +2,36 @@ TEMPLATE = app
 
 QT      += core gui
 
+contains(QT_VERSION, ^5\\.[0-8]\\..*) {
+	message("* Using Qt $${QT_VERSION}.")
+	QT += widgets
+
+	# On my system I have to specify g++ as compiler else it will use clang++ by default
+	#QMAKE_CXX=g++
+	#QMAKE_CC=gcc
+}
+
 HEADERS += \
     cvWindow.h
 
 SOURCES += \
     main.cpp \
     cvWindow.cpp
 
+## OpenCV settings for Unix/Linux
+unix:!mac {
+	message("* Using settings for Unix/Linux.")
+    INCLUDEPATH += /usr/local/include/opencv
+
+    LIBS += -L/usr/local/lib/ \
+        -lopencv_core \
+        -lopencv_highgui \
+        -lopencv_imgproc
+}
+
 ## OpenCV settings for Mac OS X
 macx {
+	message("* Using settings for Mac OS X.")
     INCLUDEPATH += /usr/local/include/opencv
 
     LIBS += -L/usr/local/lib/ \
@@ -21,6 +42,7 @@ macx {
 
 ## OpenCV settings for Windows and OpenCV 2.4.2
 win32 {
+	message("* Using settings for Windows.")
     INCLUDEPATH += "C:\\opencv\\build\\include" \
                    "C:\\opencv\\build\\include\\opencv" \
                    "C:\\opencv\\build\\include\\opencv2"
diff --git a/cvVideo/cvWindow.cpp b/cvVideo/cvWindow.cpp
@@ -61,7 +61,7 @@ void cvWindow::_tick()
     cv::cvtColor(frame, frame, CV_BGR2RGB);
 
     // Copy cv::Mat to QImage
-    qMemCopy(_image->scanLine(0), (unsigned char*)frame.data, _image->width() * _image->height() * frame.channels());
+    memcpy(_image->scanLine(0), (unsigned char*)frame.data, _image->width() * _image->height() * frame.channels());
 
     // The same as above, but much worst.
     //QImage img = QImage((uchar*) frame.data, frame.cols, frame.rows, frame.step, QImage::Format_RGB888);
