diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 180c1469fe..3061510bee 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2012-05-15 18:08 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbqt/qtwebkit/hbqtwebkit.hbm + * contrib/hbqt/hbqt_common.hbm + * INSTALL + + added support for QT from Homebrew package manager. Probably + a better option than the official installer which is a) not + compatible with latest Xcode changes b) copies millions of + files into the system file structure with no easy uninstall + or upgrade option. + 2012-05-15 13:20 UTC+0200 Viktor Szakats (harbour syenar.net) * src/common/hbgete.c ! fix to prev. test and review pls. BTW, the solution is @@ -2857,12 +2867,12 @@ * contrib/hbfimage/hbfimage.hbp * contrib/hbgd/hbgd.hbp * contrib/hbcairo/hbcairo.hbp - + added /usr/local/include to dependency search path to make HomeBrew happy + + added /usr/local/include to dependency search path to make Homebrew happy (untested) 2012-02-23 12:03 UTC+0100 Viktor Szakats (harbour syenar.net) * INSTALL - + updated OS X package manager instructions to HomeBrew (from MacPorts) + + updated OS X package manager instructions to Homebrew (from MacPorts) 2012-02-23 00:19 UTC+0100 Viktor Szakats (harbour syenar.net) * INSTALL diff --git a/harbour/INSTALL b/harbour/INSTALL index db7268a2c6..bdc21b7438 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -409,7 +409,7 @@ HARBOUR Darwin (OS X) ------------- - 1.) Install HomeBrew, follow their instructions: + 1.) Install Homebrew, follow their instructions: http://mxcl.github.com/homebrew/ 2.) $ brew install pcre slang cairo freeimage libgd mysql postgresql $ brew install upx uncrustify @@ -1626,7 +1626,7 @@ HARBOUR HB_WITH_QT - Nokia QT (GUI) [win, wce, os2, darwin, linux, free, open-source] http://qt.nokia.com/products/ http://get.qt.nokia.com/qt/source/ - Recommended OS X binary package: + OS X binary package (or use Homebrew): http://get.qt.nokia.com/qt/source/qt-mac-opensource-4.8.0.dmg Currently supported Windows binary package: http://get.qt.nokia.com/qt/source/qt-win-opensource-4.5.3-mingw.exe diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index 1fdbb53cfe..133f532f00 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -33,6 +33,7 @@ {bsd}-depincpath=qt:/usr/local/include/qt4 {darwin}-depincpath=qt:/Developer/qt/include {darwin}-depincpath=qt:/Library/Frameworks +{darwin}-depincpath=qt:/usr/local/include {beos}-depincpath=qt:/boot/common/include -instfile=contrib_qt:*.hb diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm index 5df18caeda..85919e9731 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm @@ -23,3 +23,4 @@ hbqt_init.cpp {bsd}-depincpath=qt:/usr/local/include/qt4 {darwin}-depincpath=qtwebkit:/Developer/qt/include {darwin}-depincpath=qtwebkit:/Library/Frameworks +{darwin}-depincpath=qtwebkit:/usr/local/include