summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-10 21:27:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-10 21:27:35 (GMT)
commitca890a9992ae4f3439c9f5358fccc6f576e648d7 (patch)
tree7307325c0acb7a99ab758cea99ded15ccd171bdb /src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
parent0ad5b0a3e636f95f8dfec5c8ecb39f3e85780b7f (diff)
parent774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff)
downloadQt-ca890a9992ae4f3439c9f5358fccc6f576e648d7.zip
Qt-ca890a9992ae4f3439c9f5358fccc6f576e648d7.tar.gz
Qt-ca890a9992ae4f3439c9f5358fccc6f576e648d7.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team: (157 commits) Update copyright year to 2011. Fix reversed condition introduced in 9a6cfc07e5 Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher Fix compilation error on Solaris Check elapsed time only once Added api for efficient data driven baseline testing Assistant: Fix warnings. Assistant: Don't tabify "Open Pages" dock widget by default. QmlViewer: Remove unused class variables Fixed bug and performance problem in windowsstyle. Restored old flushing behavior in -graphicssystem opengl on desktop. Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB tst_qscriptclass: backport test from the v8 branch QHostInfoCache: Use QElapsedTime instead of QTime Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file Cocoa: add support for QEventLoop::ExcludeUserInputEvents Updated QTOpenGL DEF files for WINSCW and ARMV5 ...
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp')
-rw-r--r--src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
index 3582ce6..c09fe3f 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**