Changes between Version 62 and Version 63 of BuildingQtOnLinux

Timestamp:

Jan 30, 2012 6:18:42 AM (11 years ago)

Author:

rafael.lobo@openbossa.org

Comment:

Add a link to qt5 build script.

BuildingQtOnLinux

@@ -25 +25 @@
 Finally, set the QTDIR environment variable to Qt 4.x's installation path and make sure Qt 4.x's qmake is the first qmake in your PATH (typically by running `export PATH=$QTDIR/bin:$PATH`). 
 
-If you are planning to compile it with [http://developer.qt.nokia.com/wiki/Building_Qt_5_from_Git Qt 5], QTDIR should point to `PathToRepository/qt5/qtbase/`.
+If you are planning to compile it with [http://developer.qt.nokia.com/wiki/Building_Qt_5_from_Git Qt 5], QTDIR should point to `PathToRepository/qt5/qtbase/`. You should also use this script [https://github.com/ossy-szeged/qt5-tools/blob/master/build-qt5.sh build-qt5.sh] to build Qt5 (this is what the buildbots are using). Usually once a week we update the current Qt5 hash, so keep checking out this script.
 
 If your qmake binary has a different name, e.g. when using Debian, use the --qmake= option to specify the name.
@@ -41 +41 @@
 }}}
 
-If you are planning to compile webkit2, an additional parameter to the build script is required: "-2". Qt5 is also required ([http://developer.qt.nokia.com/wiki/Building_Qt_5_from_Git build instructions]).
+If you are planning to compile webkit2, an additional parameter to the build script is required: "-2". Qt5 is also required ([http://developer.qt.nokia.com/wiki/Building_Qt_5_from_Git build instructions]), but if you're using it already, you'll be compiling webkit2 by default. Pass the flag --no-webkit2 to disable it and use webkit1 with Qt5.
 
 == Optional feature flags and CONFIG options ==