rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity
e4c21e8f38
libqt5-qtbase/qmake-add-usr-include.diff

14 lines
726 B
Diff
Raw Normal View History

Accepting request 221696 from KDE:Qt5 update license files to %doc (forwarded request 221611 from mlin7442) OBS-URL: https://build.opensuse.org/request/show/221696 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=13
2014-02-18 16:17:26 +01:00
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index e4d33e2..920ebe9 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -128,7 +128,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
Accepting request 185865 from KDE:Qt51 UUpdated baselibs.conf to have the correct 32bit packages OBS-URL: https://build.opensuse.org/request/show/185865 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=1
2013-10-01 08:13:11 +02:00
<< varGlue("DEFINES","-D"," -D","") << endl;
Accepting request 202036 from KDE:Qt51 Update to 5.1.1, resubmitted due to factory-repo-checker bug OBS-URL: https://build.opensuse.org/request/show/202036 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=2
2013-10-04 13:52:02 +02:00
t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
- t << "INCPATH = -I" << specdir();
Accepting request 221696 from KDE:Qt5 update license files to %doc (forwarded request 221611 from mlin7442) OBS-URL: https://build.opensuse.org/request/show/221696 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=13
2014-02-18 16:17:26 +01:00
+ t << "INCPATH = -I/usr/include -I" << specdir();
Accepting request 185865 from KDE:Qt51 UUpdated baselibs.conf to have the correct 32bit packages OBS-URL: https://build.opensuse.org/request/show/185865 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=1
2013-10-01 08:13:11 +02:00
if(!project->isActiveConfig("no_include_pwd")) {
QString pwd = escapeFilePath(fileFixify(qmake_getpwd()));
if(pwd.isEmpty())
Copy Permalink