Merge branch 'release/1.2.1'

Author: synapticvoid

CHANGELOG

@@ -1,3 +1,7 @@
+v1.2.1 - 2017-04-05
+- Fix sysroot symlink creation
+- Update README with Qt Creator video
+
 v1.2.0 - 2017-03-29
 - Add QtSvg module
 - Add QtSerialPort module

README.md

@@ -10,7 +10,7 @@ You can fill a contact form from our [official website](https://www.neuronalmoti
 
 ## Difference between init-qtrpi-minimal and init-qtrpi-full
 * **init-qtrpi-minimal**, the typical way: downloads ready-to-use Qt binaries for the Raspberry Pi and a minimal sysroot that we released on the [official website](http://www.qtrpi.com/download)
-* **init-qtrpi-full**, the custom way: compiles on your computer the Qt binaries for the Raspberry Pi to let you tweak the configuration, enhance the compilation by adding some missing Qt moduless to QtRpi or add some specific third-party dependencies
+* **init-qtrpi-full**, the custom way: compiles on your computer the Qt binaries for the Raspberry Pi to let you tweak the configuration, enhance the compilation by adding some missing Qt modules to QtRpi or add some specific third-party dependencies
 
 ### Summary
 |                     | init-qtrpi-minimal            | init-qtrpi-full                      |
@@ -61,7 +61,8 @@ You can now copy and execute the generated binary file on your Raspberry Pi
 Note: You can also add **/opt/qtrpi/bin/** to your `PATH` in your .bashrc and call **qmake-qtrpi** without the full path.
 
 ### Usage in Qt Creator
-*coming soon...*
+How to build a Raspberry Pi 3 application from your desktop Qt Creator (step by step video):
+[![Alt How to build a Raspberry Pi 3 application from your desktop Qt Creator](https://img.youtube.com/vi/1d2bh7iUKNc/0.jpg)](https://www.youtube.com/watch?v=1d2bh7iUKNc)
 
 ## Tutorial of init-qtrpi-full.sh
 

utils/common.sh

@@ -20,7 +20,7 @@ TARGET_DEVICE=${QTRPI_TARGET_DEVICE-'linux-rasp-pi2-g++'}
 QT_VERSION=${QTRPI_QT_VERSION-'5.7.0'}
 TARGET_HOST=$QTRPI_TARGET_HOST
 RASPBIAN_BASENAME='raspbian_latest'
-VERSION='1.2.0'
+VERSION='1.2.1'
 
 DEVICE_NAME=$(device_name $TARGET_DEVICE)
 
@@ -86,7 +86,7 @@ function download_sysroot_minimal() {
     curl $QTRPI_CURL_OPT -o $SYSROOT_ZIP $QTRPI_SYSROOT_URL
     if [[ "$INSTALL" = true ]]; then
         unzip -o $SYSROOT_ZIP
-        $UTILS_DIR/utils/switch-sysroot.sh minimal
+        $UTILS_DIR/switch-sysroot.sh minimal
     fi
 }