From patchwork Fri Dec 12 18:27:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 27455 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XzUwA-0001Za-CQ; Fri, 12 Dec 2014 19:27:34 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1XzUw8-00041n-3d; Fri, 12 Dec 2014 19:27:33 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932945AbaLLS12 (ORCPT + 1 other); Fri, 12 Dec 2014 13:27:28 -0500 Received: from mout.gmx.net ([212.227.17.22]:59317 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759274AbaLLS1H (ORCPT ); Fri, 12 Dec 2014 13:27:07 -0500 Received: from linux.local ([94.216.58.185]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0M3eDF-1XhpUG29Zp-00rHUw for ; Fri, 12 Dec 2014 19:27:05 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH] qv4l2: fix qmake project file Date: Fri, 12 Dec 2014 19:27:04 +0100 Message-Id: <1418408824-4621-1-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 X-Provags-ID: V03:K0:2KTCQt2NZwcfgXUWJz4RUxHU3xl6y13/8158N04WgbvAlbH7Y0H +Yhy3RFJQS9sdsMSTXm9vpWh4+Nu4MHnEZVFinqUEUfjIQA6NaSrc8+Tq8qIryAW7cvc8nJ W6XtvJr//eRjJ20VBiwL09PTZ+1tFXDat0ElRjVuifI6PyhDkNiLLTDnK2zlFoRNJ30VpMl TzzaAn2EhlZSC62cNsgvw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.12.12.181818 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' - do not use private paths (as done by mistake) - fix v4l-utils in place library paths Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.pro | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 19a046a..82500af 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -15,9 +15,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets # line and the line '#define HAVE_QTGL 1' from ../../config.h lessThan(QT_MAJOR_VERSION, 5): QT += opengl -INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils -INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils/utils/v4l2-ctl/ -INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils/utils/v4l2-compliance +INCLUDEPATH += $$PWD/../.. +INCLUDEPATH += $$PWD/../v4l2-ctl/ +INCLUDEPATH += $$PWD/../v4l2-compliance # Input HEADERS += alsa_stream.h @@ -44,9 +44,9 @@ SOURCES += vbi-tab.cpp SOURCES += ../v4l2-ctl/vivid-tpg.c SOURCES += ../v4l2-ctl/vivid-tpg-colors.c -LIBS += -L$$PWD/../../lib/libv4l2 -lv4l2 -LIBS += -L$$PWD/../../lib/libv4lconvert -lv4lconvert -LIBS += -L$$PWD/../libv4l2util -lv4l2util +LIBS += -L$$PWD/../../lib/libv4l2/.libs -lv4l2 +LIBS += -L$$PWD/../../lib/libv4lconvert/.libs -lv4lconvert +LIBS += -L$$PWD/../libv4l2util/.libs -lv4l2util LIBS += -lrt -ldl -ljpeg RESOURCES += qv4l2.qrc