rdieter pushed to qtsingleapplication (master). ".prf: use QT_INSTALL_HEADERS instead, drop DEPENDPATH"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri May 1 20:24:12 UTC 2015
>From de02a7255ceba5a99ed9776f06ae0efe417d7e91 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 1 May 2015 15:24:01 -0500
Subject: .prf: use QT_INSTALL_HEADERS instead, drop DEPENDPATH
diff --git a/qtsingleapplication.prf b/qtsingleapplication.prf
index 40335a1..d6da0f9 100644
--- a/qtsingleapplication.prf
+++ b/qtsingleapplication.prf
@@ -1,4 +1,5 @@
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_SingleApplication-2.6
QT *= network
+greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
+CONFIG *= qtlockedfile
diff --git a/qtsingleapplication.spec b/qtsingleapplication.spec
index d8f9953..809d9fe 100644
--- a/qtsingleapplication.spec
+++ b/qtsingleapplication.spec
@@ -3,7 +3,7 @@
Summary: Qt library to start applications only once per user
Name: qtsingleapplication
Version: 2.6.1
-Release: 15%{?dist}
+Release: 16%{?dist}
License: GPLv3 or LGPLv2 with exceptions
URL: http://doc.qt.digia.com/solutions/4/qtsingleapplication/qtsingleapplication.html
@@ -229,6 +229,9 @@ rm -rf %{buildroot}
%changelog
+* Fri May 01 2015 Rex Dieter <rdieter at fedoraproject.org> 2.6.1-16
+- .prf: use QT_INSTALL_HEADERS instead, drop DEPENDPATH
+
* Fri May 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 2.6.1-15
- fix/simplify qt5 mkspecs/features install path
- more insurance bundled qtlockedfile is not used
diff --git a/qtsinglecoreapplication.prf b/qtsinglecoreapplication.prf
index ab31668..c400d53 100644
--- a/qtsinglecoreapplication.prf
+++ b/qtsinglecoreapplication.prf
@@ -1,4 +1,3 @@
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_SingleCoreApplication-2.6
QT *= network
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/commit/?h=master&id=de02a7255ceba5a99ed9776f06ae0efe417d7e91
More information about the scm-commits
mailing list