diff --git a/qtbase b/qtbase index f05b63c5..16909f1e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f05b63c557444467ea71d8b10fbb2a4850007664 +Subproject commit 16909f1ea3135b69f153c935f01cf367b4655061 diff --git a/qtdeclarative b/qtdeclarative index cee664d5..31d6b8c3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cee664d5cb4ce6ae6951ef711a47b3063e64fe07 +Subproject commit 31d6b8c3ea4e665efb355909501c0a48081b3231 diff --git a/qtmultimedia b/qtmultimedia index 252af651..d3912792 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 252af651a787debfa65f72c7e4a85b6084f4e729 +Subproject commit d39127929b74e946c7d9fdcd1ab6f4d827e2013a diff --git a/qtquickcontrols b/qtquickcontrols index d0224f19..62c10eb3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d0224f1923e399af6f908c2c2eacaf746e114f53 +Subproject commit 62c10eb3cafd5bec0b366c3be1e81ec5547719ca diff --git a/st_build_osx.sh b/st_build_osx.sh index e9c9a935..ef0e0a41 100755 --- a/st_build_osx.sh +++ b/st_build_osx.sh @@ -5,12 +5,7 @@ set -e version=`$TEAMCITY_GIT_PATH rev-parse HEAD` install_dir=$PWD/$version -# Make sure the 10.6 sdk is installed. Unfortunately as of 5.1 Qt does not support just giving a path. -#xcodebuild -sdk macosx10.6 -version -#OSX_SDK=osxsdk-10.6-osx.tar.gz -#curl -o $OSX_SDK http://repo.suitabletech.com/downloads/osxsdk/$OSX_SDK -#tar xvzf $OSX_SDK -./configure -prefix $install_dir -release -opensource -confirm-license -shared -nomake examples -nomake demos -nomake docs -no-c++11 -platform macx-g++ +./configure -prefix $install_dir -release -opensource -confirm-license -shared -nomake examples -nomake demos -nomake docs -no-c++11 -platform macx-clang make -j8 make install