2013-04-30 02:53 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* contrib/gtqtc/gtqtc1.cpp ! reverted HB_GTI_DISPIMAGE cords ! keep maximized and fullscreen internal flags synced with QT window ! return HB_TRUE from SETMODE() method. ! updated font selection for better size approximation ! accept window size reported by QT in fullscreen and maximized modes ! set size increment steeps separately for ROWS and FONT resize modes ! respect resize step setting minimum window size - it fixes infinite resize loop in some WM % strip repeated HB_K_RESIZE keys * README.md * contrib/gtqtc/gtqtc.hbc * contrib/gtqtc/hbmk2_qtmoc.hb * synced with Viktor's patches for QT ; Pritpal, please verify if it works with QT5
2013-04-30 02:53:16 +02:00
parent 54753a023c
commit c7639b17ab
5 changed files with 147 additions and 95 deletions
--- a/README.md
+++ b/README.md
@@ -410,7 +410,7 @@ You can fine-tune the build with these options:

    $ package/mpkg_rpm_wce.sh

-## Binary .zip & .exe on Windows for all targets (except Linux)
+## Binary .zip and .exe on Windows for all targets (except Linux)

    $ set HB_DIR_NSIS=%ProgramFiles%\NSIS\
    $ set HB_DIR_ZIP=C:\info-zip\
@@ -427,7 +427,7 @@ See: [How to Build](#how-to-build)
 Then run build as usual with `clean install` options.
 See: [How to Build](#how-to-build)

-## Unified .7z & .exe installer for Windows
+## Unified .7z and .exe installer for Windows

    $ package\winuni\mpkg_win_uni.bat

@@ -492,6 +492,7 @@ the build. Make sure to adjust them to your own directories:
    HB_WITH_PCRE=C:\pcre (defaults to locally hosted version if not found)
    HB_WITH_PGSQL=C:\pgsql\include
    HB_WITH_PNG=C:\libpng (defaults to locally hosted version if not found)
+    HB_WITH_QT=C:\Qt\include (version 4.5.0 or upper is required)
    HB_WITH_SLANG= (on *nix systems)
    HB_WITH_SQLITE3=C:\sqlite3 (defaults to locally hosted version if not found)
    HB_WITH_TIFF=C:\libtiff (defaults to locally hosted version if not found)
@@ -508,6 +509,13 @@ locally hosted copy (inside Harbour source repository) of these packages,
 where applicable. `nolocal` will explicitly disable using locally hosted
 copy.

+You can override autodetection of QT 'moc' tool by using HB_QTPATH and
+optionally HB_QTPOSTFIX envvars. This may only be necessary on some *nix
+systems. F.e.:
+
+   HB_QTPATH=/opt/qt5/bin/
+   HB_QTPOSTFIX=
+
 Certain contribs can be instructed &ndash; when using .hbc files &ndash; to
 link against static build of their 3rd party lib dependencies (for
 advanced users only):
@@ -518,19 +526,19 @@ advanced users only):

 > NOTES:
 >
->    * You need to use native path format to your shell/OS.
->    * Spaces in directory names aren't currently supported.
->      You *can* use 8.3 name alias on Windows platform, though.
->    * Don't put directory names inside double quotes.
->    * Use absolute paths.
+>    * you need to use native path format to your shell/OS
+>    * spaces in directory names aren't currently supported
+>      (you *can* use 8.3 name alias on Windows platform, though)
+>    * don't put directory names inside double quotes
+>    * use absolute paths

 ## Darwin (OS X)

 1. Install [Homebrew](http://mxcl.github.com/homebrew/)
 2. Install packages:

-        $ brew install pcre slang cairo freeimage libgd mysql postgresql
-        $ brew install upx uncrustify
+        $ brew install pcre slang cairo freeimage libgd mysql postgresql qt5
+        $ brew install upx uncrustify ack optipng jpegoptim

 ## Linux (generic)

@@ -570,6 +578,7 @@ You'll need these packages to compile certain contribs and optional Harbour feat
      for contrib/hbmysql lib:   $ sudo apt-get install libmysqlclient15-dev
      for contrib/hbodbc lib:    $ sudo apt-get install unixodbc-dev
      for contrib/hbpgsql lib:   $ sudo apt-get install libpq-dev
+      for contrib/hbqt lib:      $ sudo apt-get install libqt5-dev

 Optional, to override locally hosted sources:

@@ -606,6 +615,7 @@ You'll need these packages to compile certain contribs and optional Harbour feat
      for contrib/hbodbc lib:    unixodbc-devel OR
                                 unixODBC-devel
      for contrib/hbpgsql lib:   postgresql-devel
+      for contrib/hbqt lib:      qt5-devel

 > NOTES:
 >
@@ -1144,6 +1154,7 @@ set HB_WITH_MYSQL=C:\mysql\include
 set HB_WITH_OCILIB=C:\ocilib\include
 set HB_WITH_OPENSSL=C:\openssl\inc32
 set HB_WITH_PGSQL=C:\pgsql\include
+set HB_WITH_QT=C:\Qt\include
 ```

 ## on Windows x86-64 (64-bit) hosts
@@ -1151,7 +1162,7 @@ set HB_WITH_PGSQL=C:\pgsql\include
 Same as 32-bit Windows, but, you'll have to change `%ProgramFiles%` to
 `%ProgramFiles(x86)%` for 32-bit and mixed tools, you can build for
 both x86 and x64 without building a native target first, and potential
-differences with some compilers in order to use native binaries if
+differences with some compilers in using native binaries if
 they are available.

 ```batchfile
@@ -1481,7 +1492,7 @@ mailing list.
 13. If your example involves compatibility components, make sure to test
    it against original implementation (for example, test legacy Clipper
    core language elements against real CA-Clipper 5.2e or 5.3b, or hbct
-    functions against CT3 library, etc.)
+    functions against CT3 library, etc)


 # Supported Platforms and C Compilers
@@ -1498,7 +1509,7 @@ mailing list.
 * android  - Android
 * vxworks  - VxWorks
 * symbian  - Symbian OS (experimental)
-* minix    - Minix 3 (tested on 3.2.1; earlier releases will not work)
+* minix    - Minix 3 (tested on 3.2.1; earlier releases won't work)
 * aix      - IBM AIX
 * win      - MS Windows (all flavors)
             (see [External links](#external-links) for Win9x requirements)
@@ -1780,7 +1791,7 @@ Supported shells per host platforms:
     * HB_WITH_FREEIMAGE - FreeImage [multiplatform, free, open-source]
        * <http://freeimage.sourceforge.net/>
     * HB_WITH_GD - GD Graphics Library [multiplatform, free, open-source]
-        * <http://www.boutell.com/gd/>
+        * <http://www.libgd.org/>
     * HB_WITH_GS - Ghostscript [multiplatform, free, open-source]
        * <http://www.ghostscript.com/>
        * <http://pages.cs.wisc.edu/~ghost/>
@@ -1813,6 +1824,9 @@ Supported shells per host platforms:
        * <http://www.postgresql.org/>
     * HB_WITH_PNG - libpng [multiplatform, free, open-source]
        * <http://www.libpng.org/pub/png/libpng.html>
+     * HB_WITH_QT - QT (GUI) [multiplatform, free, open-source]
+        * <https://qt-project.org/>
+        * <http://download.qt-project.org/official_releases/qt/>
     * HB_WITH_SQLITE3 - sqlite3 [multiplatform, free, open-source]
        * <http://www.sqlite.org/>
     * HB_WITH_TIFF - libtiff [multiplatform, free, open-source]
@@ -1851,6 +1865,8 @@ Supported shells per host platforms:
               (not verified with current Harbour version)
     * Valgrind (dynamic executable analysis tool) [linux, darwin-x86, free, open-source]
        * <http://valgrind.org/>
+     * ack (programmer grep) [multiplatform, free, open-source]
+        * <http://beyondgrep.com/>
     * Uncrustify (source formatter) [multiplatform, free, open-source]
        * <http://uncrustify.sourceforge.net/>
     * UPX (executable compressor) [win, dos, *nix, free, open-source]
@@ -1864,6 +1880,8 @@ Supported shells per host platforms:
     * bzip2 [multiplatform, free, open-source]
         Windows binary:
           * <http://www.bzip.org/downloads.html>
+     * Chocolatey (Windows package manager) [free, open-source]
+        * <http://chocolatey.org/>
     * GNU Make

        Windows binary + source: