Skip to content

Commit

Permalink
Merge commit 'qt/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp
  • Loading branch information
@jrbarron
jrbarron committed Aug 13, 2009
2 parents 0810781 + de088b5 commit 13cbcc0
Show file tree
Hide file tree
Showing 8,008 changed files with 27,998 additions and 18,751 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion bin/syncqt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
######################################################################
#
# Synchronizes Qt header files - internal Trolltech tool.
# Synchronizes Qt header files - internal development tool.
#
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
# Contact: Nokia Corporation (qt-info@nokia.com)
Expand Down
6 changes: 3 additions & 3 deletions config.tests/mac/crc.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"

cd "$OUTDIR/$TEST"

make distclean >/dev/null 2>&1
$MAKE distclean >/dev/null 2>&1
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"

if [ "$VERBOSE" = "yes" ]; then
make
$MAKE
else
make >/dev/null 2>&1
$MAKE >/dev/null 2>&1
fi


Expand Down
6 changes: 3 additions & 3 deletions config.tests/unix/compile.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"

cd "$OUTDIR/$TEST"

test -r Makefile && make distclean >/dev/null 2>&1
test -r Makefile && $MAKE distclean >/dev/null 2>&1

"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"

if [ "$VERBOSE" = "yes" ]; then
make
$MAKE
else
make >/dev/null 2>&1
$MAKE >/dev/null 2>&1
fi

[ -x "$EXE" ] && SUCCESS=yes
Expand Down
2 changes: 1 addition & 1 deletion config.tests/unix/doubleformat.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tes
cd "$OUTDIR/config.tests/unix/doubleformat"

DOUBLEFORMAT="UNKNOWN"
[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1

if [ -f ./doubleformattest ]; then
: # nop
Expand Down
4 changes: 2 additions & 2 deletions config.tests/unix/endian.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cd "$OUTDIR/config.tests/unix/endian"


ENDIAN="UNKNOWN"
[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1

if [ -f ./endiantest.exe ]; then
binary=./endiantest.exe
Expand All @@ -40,7 +40,7 @@ elif strings $binary | grep MostSignificantByteFirst >/dev/null 2>&1; then
fi

# make clean as this tests is compiled for both the host and the target
make distclean
$MAKE distclean

# done
if [ "$ENDIAN" = "LITTLE" ]; then
Expand Down
4 changes: 2 additions & 2 deletions config.tests/unix/ptrsize.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/un
cd "$OUTDIR/config.tests/unix/ptrsize"

if [ "$VERBOSE" = "yes" ]; then
(make clean && make)
($MAKE clean && $MAKE)
else
(make clean && make) >/dev/null 2>&1
($MAKE clean && $MAKE) >/dev/null 2>&1
fi
RETVAL=$?

Expand Down
4 changes: 2 additions & 2 deletions config.tests/x11/notype.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-
cd "$OUTDIR/config.tests/x11/notype"

if [ "$VERBOSE" = "yes" ]; then
make
$MAKE
else
make >/dev/null 2>&1
$MAKE >/dev/null 2>&1
fi

[ -x notypetest ] && NOTYPE=no
Expand Down
30 changes: 19 additions & 11 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
echo
echo "You are not licensed for Qt for Embedded Linux."
echo
echo "Please contact sales@trolltech.com to upgrade your license"
echo "Please contact qt-info@nokia.com to upgrade your license"
echo "to include Qt for Embedded Linux, or install the"
echo "Qt Open Source Edition if you intend to develop free software."
exit 1
Expand All @@ -420,7 +420,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
echo
echo "You are not licensed for the Qt/Mac platform."
echo
echo "Please contact sales@trolltech.com to upgrade your license"
echo "Please contact qt-info@nokia.com to upgrade your license"
echo "to include the Qt/Mac platform."
exit 1
;;
Expand All @@ -439,7 +439,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
echo
echo "You are not licensed for the Qt/X11 platform."
echo
echo "Please contact sales@trolltech.com to upgrade your license to"
echo "Please contact qt-info@nokia.com to upgrade your license to"
echo "include the Qt/X11 platform, or install the Qt Open Source Edition"
echo "if you intend to develop free software."
exit 1
Expand Down Expand Up @@ -850,7 +850,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-scripttools|-rpath|-force-pkg-config)
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-scripttools|-rpath|-force-pkg-config)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
Expand Down Expand Up @@ -2200,6 +2200,8 @@ if [ -z "$MAKE" ]; then
echo >&2 "Cannot proceed."
exit 1
fi
# export MAKE, we need it later in the config.tests
export MAKE
fi

fi ### help
Expand Down Expand Up @@ -2968,7 +2970,7 @@ fi
#prefix
if [ -z "$QT_INSTALL_PREFIX" ]; then
if [ "$CFG_DEV" = "yes" ]; then
QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default
QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default
elif [ "$PLATFORM_QWS" = "yes" ]; then
QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"
if [ "$PLATFORM" != "$XPLATFORM" ]; then
Expand Down Expand Up @@ -3879,7 +3881,7 @@ elif [ "$Edition" != "OpenSource" ]; then
echo " Your support and upgrade period has expired."
echo
echo " You are no longer licensed to use this version of Qt."
echo " Please contact sales@trolltech.com to renew your support"
echo " Please contact qt-info@nokia.com to renew your support"
echo " and upgrades for this license."
echo
echo "NOTICE NOTICE NOTICE NOTICE"
Expand All @@ -3897,7 +3899,7 @@ elif [ "$Edition" != "OpenSource" ]; then
echo " support, nor are you entitled to use any more recent"
echo " Qt releases."
echo
echo " Please contact sales@trolltech.com to renew your"
echo " Please contact qt-info@nokia.com to renew your"
echo " support and upgrades for this license."
echo
echo "WARNING WARNING WARNING WARNING"
Expand All @@ -3912,7 +3914,7 @@ elif [ "$Edition" != "OpenSource" ]; then
echo " Your Evaluation license has expired."
echo
echo " You are no longer licensed to use this software. Please"
echo " contact sales@trolltech.com to purchase license, or install"
echo " contact qt-info@nokia.com to purchase license, or install"
echo " the Qt Open Source Edition if you intend to develop free"
echo " software."
echo
Expand Down Expand Up @@ -5951,15 +5953,19 @@ fi
if [ "$CFG_INOTIFY" = "yes" ]; then
QT_CONFIG="$QT_CONFIG inotify"
fi
if [ "$CFG_LIBJPEG" = "system" ]; then
if [ "$CFG_LIBJPEG" = "no" ]; then
CFG_JPEG="no"
elif [ "$CFG_LIBJPEG" = "system" ]; then
QT_CONFIG="$QT_CONFIG system-jpeg"
fi
if [ "$CFG_JPEG" = "no" ]; then
QT_CONFIG="$QT_CONFIG no-jpeg"
elif [ "$CFG_JPEG" = "yes" ]; then
QT_CONFIG="$QT_CONFIG jpeg"
fi
if [ "$CFG_LIBMNG" = "system" ]; then
if [ "$CFG_LIBMNG" = "no" ]; then
CFG_MNG="no"
elif [ "$CFG_LIBMNG" = "system" ]; then
QT_CONFIG="$QT_CONFIG system-mng"
fi
if [ "$CFG_MNG" = "no" ]; then
Expand All @@ -5983,7 +5989,9 @@ if [ "$CFG_GIF" = "no" ]; then
elif [ "$CFG_GIF" = "yes" ]; then
QT_CONFIG="$QT_CONFIG gif"
fi
if [ "$CFG_LIBTIFF" = "system" ]; then
if [ "$CFG_LIBTIFF" = "no" ]; then
CFG_TIFF="no"
elif [ "$CFG_LIBTIFF" = "system" ]; then
QT_CONFIG="$QT_CONFIG system-tiff"
fi
if [ "$CFG_TIFF" = "no" ]; then
Expand Down
2 changes: 1 addition & 1 deletion demos/affine/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/affine/xform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/affine/xform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/arthurplugin/plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/books/bookdelegate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/books/bookdelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/books/bookwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/books/bookwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/books/initdb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/books/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/basic.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/basic.vsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/dotted.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/fresnel.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/glass.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/glbuffers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/glbuffers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/glextensions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/glextensions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/gltrianglemesh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion demos/boxes/granite.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://www.qtsoftware.com/contact.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
Loading

0 comments on commit 13cbcc0

Please sign in to comment.