haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc2 support for qt-4.8.5

Browse Source 
* Fix systray support by removing check for
  /boot/common/bin/qsystray. Instead we always return true
  when determining if Haiku supports a systray since qsystray
  is guaranteed to be installed
* qmake will need some fine tuning. When trying to build other
  qt based projects it will insert the wrong link flags
  (i.e. -L.../lib... instead of -L.../develop/lib...)
This commit is contained in:
Chris Roberts
2013-11-15 21:11:53 -07:00
parent 3af2497960
commit af5b369911
2 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset
View File

@@ -1,11 +1,8 @@
From 3c8c94f39ddd083200f92005b67b9a88844b3772 Mon Sep 17 00:00:00 2001
From b6cf096768020b93ce227b0ecc662a2828db2560 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 14 Nov 2013 15:34:00 -0700
Subject: [PATCH] Adjust font paths for updated Haiku fs layout
Subject: Adjust font paths for updated Haiku fs layout
---
src/gui/text/qfontdatabase_haiku.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/gui/text/qfontdatabase_haiku.cpp b/src/gui/text/qfontdatabase_haiku.cpp
index c1b9526..f7b6dd7 100644
@@ -28,3 +25,29 @@ index c1b9526..f7b6dd7 100644
--
1.8.3.4
From 144331a82b7ea68955f2e28a04eda4e6b6fbaa77 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Fri, 15 Nov 2013 19:50:49 -0700
Subject: Remove check for /boot/common/bin/qsystray
diff --git a/src/gui/util/qsystemtrayicon_haiku.cpp b/src/gui/util/qsystemtrayicon_haiku.cpp
index 2167476..7f1b1f4 100644
--- a/src/gui/util/qsystemtrayicon_haiku.cpp
+++ b/src/gui/util/qsystemtrayicon_haiku.cpp
@@ -449,8 +449,9 @@ void QSystemTrayIconPrivate::updateToolTip_sys()
bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
{
- QFileInfo qsystrayfile("/boot/common/bin/qsystray");
- return qsystrayfile.exists();
+// QFileInfo qsystrayfile("/boot/common/bin/qsystray");
+// return qsystrayfile.exists();
+ return true;
}
bool QSystemTrayIconPrivate::supportsMessages_sys()
--
1.8.3.4