update module versions

jfaust · Apr 3, 2013 · 03748af · 03748af
1 parent 00641e4
commit 03748af
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/qtbase b/qtbase
diff --git a/qtdeclarative b/qtdeclarative
diff --git a/qtmultimedia b/qtmultimedia
diff --git a/qtquickcontrols b/qtquickcontrols
diff --git 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
+1 −1		configure
+46 −3		dist/changes-5.0.2
+6 −0		examples/widgets/graphicsview/boxes/boxes.pro
+3 −1		mkspecs/common/shell-win32.conf
+102 −0		mkspecs/features/data/android/dx.bat
+1 −1		mkspecs/features/exclusive_builds.prf
+6 −2		mkspecs/features/java.prf
+4 −0		mkspecs/features/mac/default_post.prf
+3 −0		mkspecs/features/qt_parts.prf
+7 −0		src/3rdparty/freetype/builds/unix/ftconfig.h
+2 −2		src/3rdparty/freetype/include/freetype/config/ftoption.h
+1 −1		src/3rdparty/freetype/src/base/ftobjs.c
+7 −0		src/3rdparty/freetype/src/gzip/zconf.h
+7 −0		src/3rdparty/freetype/src/gzip/zlib.h
+1 −1		src/3rdparty/freetype/src/gzip/zutil.h
+1 −0		src/3rdparty/freetype/src/truetype/ttinterp.c
+3 −3		src/3rdparty/freetype/src/truetype/ttpload.c
+1 −0		src/android/java/java.pro
+1 −1		src/corelib/doc/src/objectmodel/properties.qdoc
+4 −0		src/corelib/global/qlibraryinfo.cpp
+7 −0		src/corelib/kernel/qcoreapplication.cpp
+6 −3		src/corelib/kernel/qcoreevent.cpp
+3 −2		src/corelib/kernel/qcoreevent.h
+1 −1		src/corelib/kernel/qvariant.cpp
+5 −5		src/corelib/plugin/quuid.h
+17 −0		src/gui/kernel/qevent.cpp
+10 −0		src/gui/kernel/qevent.h
+7 −0		src/gui/kernel/qguiapplication.cpp
+3 −3		src/gui/kernel/qwindow.cpp
+10 −5		src/gui/painting/qdrawhelper.cpp
+1 −0		src/gui/text/qtextformat.cpp
+1 −1		src/plugins/generic/evdevtouch/README
+2 −2		src/plugins/platforms/cocoa/qcocoamenuitem.mm
+2 −0		src/plugins/platforms/cocoa/qcocoatheme.mm
+4 −0		src/plugins/platforms/ios/qiostheme.h
+7 −7		src/plugins/platforms/ios/qiostheme.mm
+8 −4		src/plugins/platforms/windows/qwindowscontext.cpp
+4 −0		src/plugins/platforms/windows/qwindowscontext.h
+1 −2		src/printsupport/doc/src/qtprintsupport-module.qdoc
+2 −1		src/src.pro
+2 −0		src/tools/bootstrap/bootstrap.pro
+1 −1		src/tools/qdoc/doc/config/qdoc.qdocconf
+5 −5		src/tools/qdoc/qdoc.pro
+1 −1		src/tools/uic/qclass_lib_map.h
+1 −1		tests/auto/android/AndroidManifest.xml
+15 −13		tests/auto/android/res/values/libs.xml
+17 −9		tests/auto/android/runtests.pl
+4 −3		tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java
+50 −5		tests/auto/android/src/org/qtproject/qt5/android/QtNative.java
+88 −4		tools/configure/configureapp.cpp
+13 −3		examples/quick/textureprovider/etcprovider.cpp
+6 −1		examples/quick/textureprovider/etcprovider.h
+3 −1		examples/quick/textureprovider/main.cpp
+22 −8		src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
+1 −1		src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
+26 −11		src/qml/debugger/qqmldebugserver.cpp
+1 −1		src/qml/debugger/qqmldebugserverconnection_p.h
+3 −1		src/qml/qml/parser/qqmljsglobal_p.h
+1 −1		src/qml/qml/qqmlcompiler.cpp
+1 −1		src/qml/qml/qqmlpropertycache.cpp
+1 −1		src/qml/qml/v8/qv8engine.cpp
+2 −2		src/quick/items/qquickimplicitsizeitem_p.h
+7 −3		src/quick/items/qquickshadereffectsource.cpp
+3 −0		src/quick/items/qquickshadereffectsource_p.h
+3 −1		src/quick/items/qquicktext.cpp
+4 −2		src/quick/items/qquicktextedit.cpp
+3 −1		src/quick/items/qquicktextinput.cpp
+1 −0		src/quick/items/qquickwindow.cpp
+6 −0		src/quick/scenegraph/coreapi/qsgmaterial.cpp
+1 −0		src/quick/scenegraph/coreapi/qsgmaterial.h
+1 −0		src/quick/scenegraph/coreapi/qsgrenderer.cpp
+4 −0		src/quick/scenegraph/coreapi/qsgrenderer_p.h
+9 −5		src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+1 −1		src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
+3 −2		src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+4 −3		tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+60 −0		tests/auto/qml/debugger/qqmldebugservice/data/test.qml
+5 −0		tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro
+39 −1		tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
+5 −5		tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
+10 −1		tests/auto/qml/debugger/shared/debugutil.cpp
+2 −0		tests/auto/qml/debugger/shared/debugutil_p.h
+1 −1		tools/qmlscene/main.cpp
+4 −0		src/plugins/android/jar/jar.pro
+1 −1		src/plugins/gstreamer/camerabin/camerabincontrol.cpp
+2 −0		src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
+1 −0		src/plugins/pulseaudio/qaudiooutput_pulse.cpp
+2 −2		src/controls/ComboBox.qml
+0 −2		src/layouts/qgridlayoutengine.cpp
+5 −6		src/layouts/qquicklinearlayout.cpp
+4 −4		src/layouts/qquicklinearlayout_p.h
+18 −0		tests/auto/controls/data/tst_button.qml
+11 −0		tests/auto/controls/data/tst_checkbox.qml
+11 −0		tests/auto/controls/data/tst_radiobutton.qml
+12 −0		tests/auto/controls/data/tst_slider.qml
+12 −0		tests/auto/controls/data/tst_spinbox.qml
+18 −0		tests/auto/controls/data/tst_textarea.qml
+17 −0		tests/auto/controls/data/tst_textfield.qml
+18 −0		tests/auto/controls/data/tst_toolbutton.qml