USE_LIBPATH option is now finally fixed.

BUILDING

@@ -3,7 +3,7 @@ General
 
   If you can, you should use precompiled packages for your distribution.
   But if you cannot use them, or they are not available, please read
-  this informations before compiling.
+  this information before compiling.
   After your binary is successfuly compiled, you need to copy bin/ folder
   from git to specific directory by your system you compiled for.
   On Linux, you can easily do it by running make install.
@@ -35,12 +35,26 @@ Linux / Unix
 ----------------------------------------------------------------------------------
 
   There is no extra dependency, you only need Qt tools.
+  
+MAC OS X
+----------------------------------------------------------------------------------
+
+  There is no extra dependency, you only need Qt tools and XCode.
+  After successful compilation, you need to run macdeploy.sh script to correctly
+  build the application bundle. You will do it with following command:
+    
+    $ ./scripts/macdeploy.sh <path-to-macdeployqt>
+    
+  You need to specifiy path to macdeployqt (usually in QTDIR/bin/macdeployqt) only
+  if it is not in PATH.
 
 OS/2
 ----------------------------------------------------------------------------------
 
   I cannot provide support for QupZilla on OS/2 as I don't have access to
   machine with OS/2, but it is possible to get QupZilla working there.
+  
+  Builds are provided by netlabs.org (http://svn.netlabs.org/qtapps/wiki/QT4%20Networking)
 
 FreeBSD
 ----------------------------------------------------------------------------------
@@ -122,15 +136,15 @@ Available Defines
                           example:
                           $ export KDE="true"
 
-     USE_LIBPATH          By default, /usr/lib/ is used for libqupzilla and /usr/lib/qupzilla
+     USE_LIBPATH          By default, /usr/lib/ is used for libQupZilla and /usr/lib/qupzilla
                           for plugins.
-                          You can change it by setting this define.
+                          You can change it by setting this define. Ending slash is needed!
 
                           example:
                           $ export USE_LIBPATH="/usr/lib64/"
 
      NO_SYSTEM_DATAPATH   By default, QupZilla is using /usr/share/qupzilla/ path
-                          for storing themes, translations and plugins.
+                          for storing themes and translations.
                           By setting this define, QupZilla will use path of execution.
                           (disabled by default)
 
@@ -142,6 +156,7 @@ Available Defines
                           QupZilla binary will then be moved to PREFIX/bin/, use
                           PREFIX/share/qupzilla/ as datadir, PREFIX/share/applications for
                           desktop launcher and PREFIX/share/pixmaps for icon.
+                          Ending slash is needed!
 
                           example:
                           $ export QUPZILLA_PREFIX="/usr/"

README.md

@@ -1,8 +1,8 @@
 QupZilla Web Browser
 ----------------------------------------------------------------------------------------
 
-Homepage: http://www.qupzilla.com   
-Blog: http://blog.qupzilla.com/   
+Homepage: [http://www.qupzilla.com](http://www.qupzilla.com)   
+Blog: [http://blog.qupzilla.com](http://blog.qupzilla.com)   
 IRC: `#qupzilla` at `irc.freenode.net`
 
 About QupZilla

TODO

@@ -11,3 +11,9 @@ The list is not sorted by priority.
 * New LocationBar completer
 * (KDE) Nepomuk integration
 * Page previews as tooltip on tabs (like Opera)
+* Support for remote Web inspector
+* option to save RSS feeds in external reader
+* Session manager
+* Editable toolbar
+* NoScript plugin
+* GreaseMonkey plugin (userscripts)

scripts/macdeploy.sh

@@ -1,14 +1,20 @@
 #!/bin/bash
-COMMAND=$1
+#
+# Usage: ./macdeploy.sh [<full-path-to-macdeployqt>]
+# 
+# macdeployqt is usually located in QTDIR/bin/macdeployqt
+# If path to macdeployqt is not specified, using it from PATH
+
+COMMAND="macdeployqt"
 LIBRARY_NAME="libQupZilla.1.dylib"
 
-if [ $COMMAND = "" ]; then
- $COMMAND="macdeployqt"
+if [ -n "$1" ]; then
+ COMMAND=$1
 fi
 
 # cd to directory with bundle
-test -d build || cd ..
-cd build
+test -d bin || cd ..
+cd bin
 
 # copy libQupZilla into bundle
 cp $LIBRARY_NAME QupZilla.app/Contents/MacOS/

src/lib/plugins/plugins.cpp

@@ -161,7 +161,7 @@ void Plugins::loadAvailablePlugins()
     dirs << mApp->DATADIR + "plugins/"
 #ifdef Q_WS_X11
 #ifdef USE_LIBPATH
-         << USE_LIBPATH + "qupzilla/"
+         << USE_LIBPATH "qupzilla/"
 #else
          << "/usr/lib/qupzilla/"
 #endif

src/main/appicon_os2.rc

@@ -1,2 +1,2 @@
-ICON 1 "..\lib\data\icons\exeicons\qupzilla_os2.ico"
-ICON 2 "..\lib\data\icons\exeicons\page_os2.ico"
+ICON 1 "../lib/data/icons/exeicons/qupzilla_os2.ico"
+ICON 2 "../lib/data/icons/exeicons/page_os2.ico"