Merge remote-tracking branch 'origin/develop'

Change-Id: I81d71932b8104e973b962749d4bad66edc76e8b8

4 files changed, 15 insertions, 3 deletions

diff --git a/README b/README
index f38040dc..9970e8a8 100644
--- a/README
+++ b/README
@@ -76,7 +76,7 @@ others may be only partially implemented. Here are some known issues:
 - Mac: Graphs drawn half the size on Retina displays.
 - Using multiple graphs in one application crashes on application shutdown
   unless the last graph to have active context is deleted last.
-- Android doesn't support both widgets and OpenGL simulataneously, so only
+- Android doesn't support both widgets and OpenGL simultaneously, so only
   the Qt Quick 2 API is usable in practice in Android.
 - Shadows are not supported with OpenGL ES2 (including Angle builds in Windows).
 - Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows).
diff --git a/examples/audiolevels/doc/images/audiolevels-example.png b/examples/audiolevels/doc/images/audiolevels-example.png
index c6e12d09..68d9121e 100644
--- a/examples/audiolevels/doc/images/audiolevels-example.png
+++ b/examples/audiolevels/doc/images/audiolevels-example.png
diff --git a/tools/generate_package_linux.sh b/tools/generate_package_linux.sh
index 6a596d35..97aff841 100755
--- a/tools/generate_package_linux.sh
+++ b/tools/generate_package_linux.sh
@@ -13,7 +13,7 @@ fi
 
 if [ "$2" = "" ]
 then
-    DATAVIS_BRANCH=master
+    DATAVIS_BRANCH=origin/master
 else
     DATAVIS_BRANCH=$2
 fi
@@ -30,6 +30,7 @@ DATAVIS_FINAL_TAR=$DATAVIS_CURRENT_DIR/../qtdatavisualization_$DATAVIS_VERSION.t
 echo Exporting $DATAVIS_BRANCH to $DATAVIS_TEMP_TAR_FULL...
 rm -r -f $DATAVIS_TEMP_DIR_FULL 2> /dev/null
 mkdir -p $DATAVIS_TEMP_DIR_FULL 2> /dev/null
+git fetch
 git archive --format tar --output $DATAVIS_TEMP_TAR_FULL $DATAVIS_BRANCH
 
 echo Unpacking $DATAVIS_TEMP_TAR_FULL to $DATAVIS_PACKAGE_UNTAR_DIR and $DATAVIS_BUILD_DIR...
@@ -37,6 +38,11 @@ mkdir -p $DATAVIS_PACKAGE_UNTAR_DIR 2> /dev/null
 mkdir -p $DATAVIS_BUILD_DIR 2> /dev/null
 tar -xvf $DATAVIS_TEMP_TAR_FULL -C $DATAVIS_PACKAGE_UNTAR_DIR > /dev/null
 tar -xvf $DATAVIS_TEMP_TAR_FULL -C $DATAVIS_BUILD_DIR > /dev/null
+#Workaround for git archive bug
+rm -r -f $DATAVIS_PACKAGE_UNTAR_DIR/tools
+rm -r -f $DATAVIS_PACKAGE_UNTAR_DIR/tests
+rm -r -f $DATAVIS_BUILD_DIR/tools
+rm -r -f $DATAVIS_BUILD_DIR/tests
 
 echo Generating includes, mkspecs, and docs in $DATAVIS_BUILD_DIR...
 cd $DATAVIS_BUILD_DIR
diff --git a/tools/generate_package_win.cmd b/tools/generate_package_win.cmd
index 2a1895b7..a1046f6b 100644
--- a/tools/generate_package_win.cmd
+++ b/tools/generate_package_win.cmd
@@ -14,7 +14,7 @@ if "%1"=="" (
 )
 
 if "%2"=="" (
-    set DATAVIS_BRANCH=master
+    set DATAVIS_BRANCH=origin/master
 ) else (
     set DATAVIS_BRANCH=%2
 )
@@ -30,6 +30,7 @@ set DATAVIS_FINAL_ZIP=..\qtdatavisualization_%DATAVIS_VERSION%.zip
 echo Exporting %DATAVIS_BRANCH% to %DATAVIS_TEMP_ZIP_FULL%...
 rmdir /q /s %DATAVIS_TEMP_DIR_FULL% 2> NUL
 md %DATAVIS_TEMP_DIR_FULL% 2> NUL
+call git fetch
 call git archive --format zip --output ../%DATAVIS_TEMP_DIR%/%DATAVIS_TEMP_ZIP% %DATAVIS_BRANCH%
 
 echo Unzipping %DATAVIS_TEMP_ZIP_FULL% to %DATAVIS_PACKAGE_UNZIP_DIR% and %DATAVIS_BUILD_DIR%...
@@ -37,6 +38,11 @@ md %DATAVIS_PACKAGE_UNZIP_DIR% 2> NUL
 md %DATAVIS_BUILD_DIR% 2> NUL
 call 7z x -y -o%DATAVIS_PACKAGE_UNZIP_DIR% %DATAVIS_TEMP_ZIP_FULL%  > NUL
 call 7z x -y -o%DATAVIS_BUILD_DIR% %DATAVIS_TEMP_ZIP_FULL%  > NUL
+::Workaround for git archive bug
+rmdir /q /s %DATAVIS_PACKAGE_UNZIP_DIR%\tests 2> NUL
+rmdir /q /s %DATAVIS_PACKAGE_UNZIP_DIR%\tools 2> NUL
+rmdir /q /s %DATAVIS_BUILD_DIR%\tests 2> NUL
+rmdir /q /s %DATAVIS_BUILD_DIR%\tools 2> NUL
 
 echo Generating includes, mkspecs, and docs in %DATAVIS_BUILD_DIR%...
 pushd %DATAVIS_BUILD_DIR%