qt:qt.git
11 years agoRemove qDebug.
Morten Johan Sørvig [Thu, 11 Nov 2010 12:01:37 +0000 (13:01 +0100)]
Remove qDebug.

11 years agoSupport exception handling in QtConcurrent::run()
Morten Johan Sørvig [Thu, 11 Nov 2010 08:59:53 +0000 (09:59 +0100)]
Support exception handling in QtConcurrent::run()

Use QFutureInterface::reportException() in the
same way that we do in QtConcurrent::map().

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 20:19:57 +0000 (21:19 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023
  Fix warnings
  QtCore autotests:  make them paralelized.
  Fix crash in tst_QByteArray::qUncompress
  Support glyph subpixel positioning without subpixel rendering

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 17:51:43 +0000 (18:51 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update the text cursor's position for input method events.

11 years agoAmend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023
Olivier Goffart [Wed, 10 Nov 2010 16:40:17 +0000 (17:40 +0100)]
Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023

It is a typo. Else, it overflows

11 years agoFix warnings
Olivier Goffart [Mon, 8 Nov 2010 08:56:56 +0000 (09:56 +0100)]
Fix warnings

Regarding conversion from char* to QString

Reviewed-by: Joao
11 years agoQtCore autotests: make them paralelized.
Olivier Goffart [Wed, 10 Nov 2010 15:14:01 +0000 (16:14 +0100)]
QtCore autotests:  make them paralelized.

The filesystem autotests are not paralized (because i was scary)

For reference, script I used:

cat corelib.pro |  grep -v "=" | grep \\\\ | cut -f1 -d\\ | sed "s/\(.*\) /\1/" | grep -v file | xargs -I{}  echo "echo CONFIG += parallel_test >>  {}/{}.pro" > t
. t

Reviexed-by: Joao
11 years agoFix crash in tst_QByteArray::qUncompress
Olivier Goffart [Wed, 10 Nov 2010 16:02:02 +0000 (17:02 +0100)]
Fix crash in tst_QByteArray::qUncompress

On 64-bit systems, len + sizeof(QByteArray::Data) could overflow and become 0
In this case, qRealloc could succeed and return 0, leading to a double free.

Reviewed-by: Joao
11 years agoUpdate the text cursor's position for input method events.
Pierre Rossi [Wed, 10 Nov 2010 14:39:19 +0000 (15:39 +0100)]
Update the text cursor's position for input method events.

Task-number: QTBUG-2064
Reviewed-by: Jiang Jiang
11 years agoSupport glyph subpixel positioning without subpixel rendering
Jiang Jiang [Wed, 10 Nov 2010 13:18:08 +0000 (14:18 +0100)]
Support glyph subpixel positioning without subpixel rendering

Previously subpixel positioning was only used when subpixel rendering
is enabled (glyphType == Raster_RGBMask), however, it does not
necessarily require that and for Mac OS X it will keep using
subpixel positioning even when LCD font smoothing (subpixel rendering)
is turned off. To maintain consistency when switching to raster,
we should support subpixel positioning in this case.

Task-number: QTBUG-5053
Reviewed-by: Jørgen Lind
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 13:53:28 +0000 (14:53 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  QDeclarativeDebug: Add autotest for [re]setBindingForObject

11 years agoQDeclarativeDebug: Add autotest for [re]setBindingForObject
Kai Koehne [Wed, 10 Nov 2010 13:31:53 +0000 (14:31 +0100)]
QDeclarativeDebug: Add autotest for [re]setBindingForObject

Add initial testing for setBindingForObject, resetBindingForObject in
QDeclarativeDebug.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 09:02:37 +0000 (10:02 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add more test entries for built-in JS types
  Update generated QScriptValue test files

11 years agoAdd more test entries for built-in JS types
Kent Hansen [Wed, 10 Nov 2010 08:45:36 +0000 (09:45 +0100)]
Add more test entries for built-in JS types

In particular the "wrapper" types (Boolean, Number, String) were
not tested at all.

Reviewed-by: Jedrzej Nowacki
11 years agoUpdate generated QScriptValue test files
Kent Hansen [Wed, 10 Nov 2010 08:25:54 +0000 (09:25 +0100)]
Update generated QScriptValue test files

A couple of bugs were introduced in the generator when it was
refactored; fixed now.
The generated tests are now in a separate directory/class, so
the test function qualifier had to be updated.

Reviewed-by: Jedrzej Nowacki
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 21:46:53 +0000 (22:46 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add autotests for setting non-Object as prototype value
  Revert new flaky test
  compile fix for namespaced Qt
  Ensured that the document nodes are sorted in the generated index.
  Make qsTr() work with Unicode (non-Latin-1) strings
  Add autotest that checks return value of QScriptContext::throwXXX()
  Improve autotest coverage of QScriptEngineDebugger
  Add benchmark for emitting signals from QtScript
  Split monolithic QtScript autotest into smaller tests

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 19:23:58 +0000 (20:23 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed deployment for symbian/linux-armcc when using shadow builds.
  Started using qtmain.lib for all Qt applications, also corelib ones.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 16:01:09 +0000 (17:01 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Really fix getting qmakespec on windows

11 years agoReally fix getting qmakespec on windows
aavit [Tue, 9 Nov 2010 11:20:26 +0000 (12:20 +0100)]
Really fix getting qmakespec on windows

11 years agoAdd autotests for setting non-Object as prototype value
Kent Hansen [Tue, 9 Nov 2010 11:06:31 +0000 (12:06 +0100)]
Add autotests for setting non-Object as prototype value

Currently it's possible to set the prototype to be any value,
but this doesn't make sense; see QTBUG-15154.
Mark test as expected failure until it's fixed.

11 years agoFixed deployment for symbian/linux-armcc when using shadow builds.
axis [Mon, 8 Nov 2010 15:13:54 +0000 (16:13 +0100)]
Fixed deployment for symbian/linux-armcc when using shadow builds.

RevBy:    Miikka Heikkinen

11 years agoStarted using qtmain.lib for all Qt applications, also corelib ones.
axis [Mon, 8 Nov 2010 14:18:11 +0000 (15:18 +0100)]
Started using qtmain.lib for all Qt applications, also corelib ones.

This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.

Task:     QTBUG-14735
RevBy:    Miikka Heikkinen

11 years agoRevert new flaky test
Kent Hansen [Tue, 9 Nov 2010 06:59:34 +0000 (07:59 +0100)]
Revert new flaky test

Apparently this crashes on Mac. Remove for now, pending further
investigation.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 8 Nov 2010 22:40:57 +0000 (23:40 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  compile fix for namespaced Qt
  Ensured that the document nodes are sorted in the generated index.
  Make qsTr() work with Unicode (non-Latin-1) strings
  Add autotest that checks return value of QScriptContext::throwXXX()
  Improve autotest coverage of QScriptEngineDebugger
  Add benchmark for emitting signals from QtScript
  Split monolithic QtScript autotest into smaller tests

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Mon, 8 Nov 2010 18:52:32 +0000 (19:52 +0100)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Task-number: QTBUG-15059

11 years agocompile fix for namespaced Qt
hjk [Mon, 8 Nov 2010 17:09:12 +0000 (18:09 +0100)]
compile fix for namespaced Qt

11 years agoEnsured that the document nodes are sorted in the generated index.
David Boddie [Mon, 8 Nov 2010 17:04:39 +0000 (18:04 +0100)]
Ensured that the document nodes are sorted in the generated index.

Task-number: QTBUG-13828

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Mon, 8 Nov 2010 16:06:35 +0000 (17:06 +0100)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMake qsTr() work with Unicode (non-Latin-1) strings
Kent Hansen [Mon, 8 Nov 2010 12:25:30 +0000 (13:25 +0100)]
Make qsTr() work with Unicode (non-Latin-1) strings

Converting the source string/context/comment to Latin-1 is very
broken, since JS strings are UTF-16.
The strings should be converted to UTF-8, which should also be
the default encoding for qsTranslate().
Effectively, this bug meant that only Latin-1 characters could
be used in source strings; the translations themselves could
have non-Latin-1 characters. But there was data loss in the
case where you passed a source string for which no translation
was found (since the Latin-1-ized string would be returned).

Task-number: QTBUG-14989
Reviewed-by: Jedrzej Nowacki
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Mon, 8 Nov 2010 14:46:21 +0000 (15:46 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Get the qmakespec correctly on all platforms

11 years agoAdd autotest that checks return value of QScriptContext::throwXXX()
Kent Hansen [Thu, 4 Nov 2010 12:10:53 +0000 (13:10 +0100)]
Add autotest that checks return value of QScriptContext::throwXXX()

The documentation says that they should return the error/value
that was thrown. When throwError() is called from a native function
call, the return value of the function will be ignored, so we need
a test that calls throwError() outside of a function context.

Reviewed-by: Jedrzej Nowacki
11 years agoImprove autotest coverage of QScriptEngineDebugger
Kent Hansen [Tue, 2 Nov 2010 15:27:20 +0000 (16:27 +0100)]
Improve autotest coverage of QScriptEngineDebugger

The internal coverage is still poor, but at least the public API
has 100% coverage now.

11 years agoAdd benchmark for emitting signals from QtScript
Kent Hansen [Tue, 2 Nov 2010 13:06:51 +0000 (14:06 +0100)]
Add benchmark for emitting signals from QtScript

Reviewed-by: Jedrzej Nowacki
11 years agoSplit monolithic QtScript autotest into smaller tests
Kent Hansen [Tue, 2 Nov 2010 09:43:40 +0000 (10:43 +0100)]
Split monolithic QtScript autotest into smaller tests

Reviewed-by: Jedrzej Nowacki
11 years agoGet the qmakespec correctly on all platforms
aavit [Mon, 8 Nov 2010 14:28:44 +0000 (15:28 +0100)]
Get the qmakespec correctly on all platforms

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Mon, 8 Nov 2010 09:05:25 +0000 (10:05 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert "QPointer: assert when using QPointer on destroyed QObject"
  Silence warning in qvector with MSVC
  QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
  QStyleSheetStyle: add a way to style the up arrow
  QPointer: assert when using QPointer on destroyed QObject
  Add missing Q_ENUMS to QAbstractSocket
  Fix QMenu rendering in the unified toolbar
  Add even more platform info, and make it expandable.
  Hide nonfunctional links, and improve html

11 years agoRevert "QPointer: assert when using QPointer on destroyed QObject"
Olivier Goffart [Mon, 8 Nov 2010 08:57:55 +0000 (09:57 +0100)]
Revert "QPointer: assert when using QPointer on destroyed QObject"

This reverts commit 96e873d4ed59bd9feef1c5dacc28f77377e53c47.

Many tests where failing. (including the QWidget autotest)

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 8 Nov 2010 02:15:01 +0000 (03:15 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Task-number: QTBUG-15059

11 years agoTask-number: QTBUG-15059
juhvu [Mon, 8 Nov 2010 01:43:53 +0000 (11:43 +1000)]
Task-number: QTBUG-15059
Removed implicit QtGui linking from qsymbianbearer plugin as it
is not needed.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sat, 6 Nov 2010 19:16:28 +0000 (20:16 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Silence warning in qvector with MSVC
  QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
  QStyleSheetStyle: add a way to style the up arrow
  QPointer: assert when using QPointer on destroyed QObject
  Add missing Q_ENUMS to QAbstractSocket
  Fix QMenu rendering in the unified toolbar
  Add even more platform info, and make it expandable.
  Hide nonfunctional links, and improve html

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 6 Nov 2010 16:08:44 +0000 (17:08 +0100)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute
  tst_qnetworkreply: One more HTTP test using setReadBufferSize()
  Hide the cursor in the tested text edit

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Sat, 6 Nov 2010 16:05:51 +0000 (17:05 +0100)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sat, 6 Nov 2010 04:55:01 +0000 (05:55 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Silence warning in qvector with MSVC
  QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
  QStyleSheetStyle: add a way to style the up arrow
  QPointer: assert when using QPointer on destroyed QObject
  Add missing Q_ENUMS to QAbstractSocket
  Fix QMenu rendering in the unified toolbar
  Add even more platform info, and make it expandable.
  Hide nonfunctional links, and improve html

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 6 Nov 2010 02:17:00 +0000 (03:17 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
  mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
  mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
  mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
  configure: Deal with multiple redefinitions of qmake variables
  Split QScriptValue::call autotest into smaller tests.
  Optimize and clean up QClipData::fixup()
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  ...

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Fri, 5 Nov 2010 23:15:28 +0000 (00:15 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Hide the cursor in the tested text edit

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 5 Nov 2010 22:52:50 +0000 (23:52 +0100)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (72 commits)
  Fix opening a network session multiple times in succession.
  Fix synchronous dispatch in ICD in non-main threads.
  Russian translation update
  QNAM HTTP: Download last chunk properly when readBufferSize() limited
  Remove code changes that were NOT intended as part of the fix
  Prevent access to non-existent memory in QGL2PEXVertexArray
  Wordwrap QInputDialog label in Symbian
  Prevent excessive seeks in xbm detection
  Use qtmain.lib to provide entry point for all Symbian applications
  Give the toplevel widget a layout
  Doc: Correcting character escape bug
  fix tests when using Qt in a namespace
  Fix tst_symbols auto test
  Doc: Clarified the lifetime of the session bus connection.
  Doc: Added a snippet showing the default BorderImage tiling behavior.
  Doc: using pointer member variables and language change
  Doc: Added more instructions to help with device file permissions.
  Doc: Mentioned default values for the BorderImage tile modes.
  Document the difference between +0.0 and -0.0 for QPointF and QSizeF.
  trivial: fix build
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 19:38:07 +0000 (20:38 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Silence warning in qvector with MSVC
  QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
  QStyleSheetStyle: add a way to style the up arrow
  QPointer: assert when using QPointer on destroyed QObject
  Add missing Q_ENUMS to QAbstractSocket
  Fix QMenu rendering in the unified toolbar
  Add even more platform info, and make it expandable.
  Hide nonfunctional links, and improve html

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 17:29:58 +0000 (18:29 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute
  tst_qnetworkreply: One more HTTP test using setReadBufferSize()

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 17:07:58 +0000 (18:07 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
  mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
  mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
  mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
  configure: Deal with multiple redefinitions of qmake variables
  Split QScriptValue::call autotest into smaller tests.
  Optimize and clean up QClipData::fixup()
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  ...

11 years agoSilence warning in qvector with MSVC
Olivier Goffart [Fri, 5 Nov 2010 16:20:16 +0000 (17:20 +0100)]
Silence warning in qvector with MSVC

Conversion from size_t to int loose precision

Reviewed-by: Robin Burchell
11 years agoQStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
Olivier Goffart [Fri, 5 Nov 2010 11:59:18 +0000 (12:59 +0100)]
QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle

The problem is that when a widget is destroyed, it was not properly removed
from the cache.  We connected the destroyed signal to a slot in the
QStyleSheetStyle for the first QStyleSheetStyle that handle a widget.
but if this QStyleSheetStyle is destroyed, that connection is lost.

Solution:  Create a new QStyleSheetStyleCaches that will be responsible
to clean the caches. This objects is not destroyed as long as there is
a QStyleSheetStyle instance, so the connection is not lost.

I took the oportunity to move all the caches to this object.

Reveiwed-by: Gabriel
Task-number: QTBUG-11658

11 years agoQStyleSheetStyle: add a way to style the up arrow
Olivier Goffart [Fri, 5 Nov 2010 09:52:30 +0000 (10:52 +0100)]
QStyleSheetStyle: add a way to style the up arrow

Patch originaly from Martin Petersson

Task-number: QTBUG-13491

11 years agoQPointer: assert when using QPointer on destroyed QObject
Olivier Goffart [Thu, 25 Mar 2010 15:39:19 +0000 (16:39 +0100)]
QPointer: assert when using QPointer on destroyed QObject

Uses the same assert as in QWeakPointer

Reviewed-by: Thiago
Task-number: QTBUG-9398

11 years agoAdd missing Q_ENUMS to QAbstractSocket
Olivier Goffart [Thu, 4 Nov 2010 12:25:51 +0000 (13:25 +0100)]
Add missing Q_ENUMS to QAbstractSocket

Task-number: QT-1635
Reviewed-by: Markus Goetz
11 years agoMerge remote branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Fri, 5 Nov 2010 16:35:28 +0000 (17:35 +0100)]
Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
mkspecs/features/symbian/symbian_building.prf
src/network/access/qhttpnetworkconnectionchannel.cpp

11 years agoFix QMenu rendering in the unified toolbar
Fabien Freling [Fri, 5 Nov 2010 15:55:31 +0000 (16:55 +0100)]
Fix QMenu rendering in the unified toolbar
with the raster engine.

Task-number: QTBUG-12818
Reviewed-by: Samuel Rødal
11 years agomkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
Tor Arne Vestbø [Fri, 5 Nov 2010 14:54:54 +0000 (15:54 +0100)]
mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf

Since gcc-base is used for Clang and LLVM as well, we should not define
QMAKE_CC and QMAKE_CXX there. Moving it to g++-base.conf reduces the risk
of parsing errors in configure such as the one in dacda67ee449b6291.

Reviewed-by: ossi
11 years agomkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
Tor Arne Vestbø [Fri, 5 Nov 2010 14:53:24 +0000 (15:53 +0100)]
mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly

Reviewed-by: ossi
11 years agomkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
Tor Arne Vestbø [Fri, 5 Nov 2010 14:50:00 +0000 (15:50 +0100)]
mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior

Reviewed-by: ossi
11 years agoconfigure: Deal with multiple redefinitions of qmake variables
Tor Arne Vestbø [Fri, 5 Nov 2010 13:32:54 +0000 (14:32 +0100)]
configure: Deal with multiple redefinitions of qmake variables

The function setBootstrapVariable() did not account for multiple
definitions of the same variable, eg. QMAKE_CC=foo; QMAKE_CC=bar

We now look for '+=' and only append the values if this is found,
otherwise we reset the variable to the given value, and continue
looking for extra values.

Reviewed-by: ossi
11 years agoMerge branch 'lancelot'
aavit [Fri, 5 Nov 2010 14:39:43 +0000 (15:39 +0100)]
Merge branch 'lancelot'

11 years agoAdd even more platform info, and make it expandable.
aavit [Fri, 5 Nov 2010 14:33:41 +0000 (15:33 +0100)]
Add even more platform info, and make it expandable.

11 years agotst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute
Markus Goetz [Fri, 5 Nov 2010 14:03:06 +0000 (15:03 +0100)]
tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 13:42:15 +0000 (14:42 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Prevent multiple modprobe messages for the same phone
  Fix detection of N95 with linux 2.6.34+

11 years agoPrevent multiple modprobe messages for the same phone
Shane Kearns [Fri, 5 Nov 2010 13:27:48 +0000 (14:27 +0100)]
Prevent multiple modprobe messages for the same phone

Cleaned up some unnecessary code in the serenum_unix file.
Add the device only once to the list used for printing info about
devices with no serial drivers.
Add each ACM interface ID, trusting the numbers given in the master
interface. The existing code of searching for the slave interface
would have been appropriate for a user-mode device driver, but we only
need the interface numbers as we are going to use existing device drivers
via the tty devices

Reviewed-By: axis
11 years agoFix detection of N95 with linux 2.6.34+
Shane Kearns [Fri, 5 Nov 2010 13:20:42 +0000 (14:20 +0100)]
Fix detection of N95 with linux 2.6.34+

Linux cdc-acm driver detects the debug port on some Nokia phones automatically
When it does, it creates two ttyACMx devices and the symlink in
/dev/serial/by-id contains the CDC master interface number.

In contrast the generic usbserial driver creates a symlink containing the
CDC slave interface number. This is because it knows nothing about CDC
and is just looking for BULK IN/OUT interfaces that might be serial ports.

This change creates match strings for both the master and slave interfaces,
so the phone is detected if either driver is loaded.

Reviewed-By: axis
11 years agotst_qnetworkreply: One more HTTP test using setReadBufferSize()
Markus Goetz [Fri, 5 Nov 2010 13:11:30 +0000 (14:11 +0100)]
tst_qnetworkreply: One more HTTP test using setReadBufferSize()

Task-number: QTBUG-13431

11 years agoHide the cursor in the tested text edit
Harald Fernengel [Fri, 5 Nov 2010 12:22:20 +0000 (13:22 +0100)]
Hide the cursor in the tested text edit

Hiding the cursor will make the image comparison more robust. This fixes
the sporadic test fail we saw on some machines - every time the blinking
cursor was visible, the test failed.

Reviewed-by: Robert Griebl
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Fri, 5 Nov 2010 10:46:00 +0000 (11:46 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
  Give the toplevel widget a layout
  fix tests when using Qt in a namespace
  Fix tst_symbols auto test
  trivial: fix build
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  ...

11 years agoSplit QScriptValue::call autotest into smaller tests.
Jedrzej Nowacki [Fri, 5 Nov 2010 10:11:50 +0000 (12:11 +0200)]
Split QScriptValue::call autotest into smaller tests.

The test was testing too much. Split them into more manageable
chunks.

Reviewed-by: Kent Hansen
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 07:54:52 +0000 (08:54 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits)
  Optimize and clean up QClipData::fixup()
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  Add more microbenchmarks for QScriptEngine
  QNAM HTTP: Do not set cache headers when already set by user
  QNAM: Do not cache network connections per username.
  Refactor tst_QScriptValue::instanceOf
  Refactor tst_QScriptValue::getSetPrototype
  ...

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 05:13:42 +0000 (06:13 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix opening a network session multiple times in succession.
  Fix synchronous dispatch in ICD in non-main threads.
  Russian translation update
  QNAM HTTP: Download last chunk properly when readBufferSize() limited
  Prevent access to non-existent memory in QGL2PEXVertexArray
  Prevent excessive seeks in xbm detection

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 03:15:02 +0000 (04:15 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix compilation issue for the Carbon build.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 02:38:55 +0000 (03:38 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits)
  Optimize and clean up QClipData::fixup()
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  Add more microbenchmarks for QScriptEngine
  QNAM HTTP: Do not set cache headers when already set by user
  QNAM: Do not cache network connections per username.
  Refactor tst_QScriptValue::instanceOf
  Refactor tst_QScriptValue::getSetPrototype
  ...

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 01:17:29 +0000 (02:17 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  Doc: Correcting character escape bug
  Doc: Clarified the lifetime of the session bus connection.
  Doc: Added a snippet showing the default BorderImage tiling behavior.
  Doc: using pointer member variables and language change
  Doc: Added more instructions to help with device file permissions.
  Doc: Mentioned default values for the BorderImage tile modes.
  Document the difference between +0.0 and -0.0 for QPointF and QSizeF.

11 years agoFix opening a network session multiple times in succession.
Aaron McCarthy [Fri, 5 Nov 2010 01:08:31 +0000 (11:08 +1000)]
Fix opening a network session multiple times in succession.

Don't try to open the network session if there is already an in progress
open request.

11 years agoFix synchronous dispatch in ICD in non-main threads.
Aaron McCarthy [Fri, 5 Nov 2010 00:01:24 +0000 (10:01 +1000)]
Fix synchronous dispatch in ICD in non-main threads.

ICD DBus signals always come in via the main thread. During synchronous
dispatch these signals were not being emitted when expected because no
event loop is running in the destination thread. Fixed by added a call
to QCoreApplication::sendPostedEvents(object, QEvent::MetaCall) in the
synchronous dispatch loop.

Task-number: QTBUG-15004

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Thu, 4 Nov 2010 22:27:39 +0000 (23:27 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed elf2e32_qtwrapper when not using def files.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 4 Nov 2010 19:25:15 +0000 (20:25 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Remove code changes that were NOT intended as part of the fix
  Wordwrap QInputDialog label in Symbian
  Use qtmain.lib to provide entry point for all Symbian applications

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Thu, 4 Nov 2010 18:59:39 +0000 (19:59 +0100)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits)
  Fix bearermonitor when building for Maemo in scratchbox.
  The lastCenterPoint should be equal to centerPoint for new gestures.
  PinchGesture: lastRotationAngle should start at 0.
  tst_qnetworkreply: Add testcase for unknown authentication method
  QNAM: Reset authenticator state properly between requests
  msvc: enable unreferenced code elimination in release with debuginfo builds
  exclude headers in builddir from -copy option
  more elegant treatment of qconfig.h special case
  qdoc: Added next and previous links to top of pages.
  Doc: style tuning
  Doc: fixing style - tool buttons to bold.
  Doc: updating the template to support search feature better.
  Doc: Fixing columns to display all elements in lists - css3
  simplify recursive symlinking
  Doc: fixing bugs in style
  Doc: fixing style for search display and slim fit menus
  Doc: Fixing bug in sorting script for search results.
  Doc: Fixed basic language.
  Doc: Added Windows Vista to the trademark list.
  Doc: Updated the Java trademark information.
  ...

11 years agoRussian translation update
Sergey Belyashov [Thu, 4 Nov 2010 16:21:33 +0000 (17:21 +0100)]
Russian translation update

Merge-request: 895
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Thu, 4 Nov 2010 16:06:40 +0000 (17:06 +0100)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoQNAM HTTP: Download last chunk properly when readBufferSize() limited
Markus Goetz [Thu, 4 Nov 2010 14:24:32 +0000 (15:24 +0100)]
QNAM HTTP: Download last chunk properly when readBufferSize() limited

Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
11 years agoFix compilation issue for the Carbon build.
Fabien Freling [Thu, 4 Nov 2010 14:19:03 +0000 (15:19 +0100)]
Fix compilation issue for the Carbon build.

The unified toolbar with the raster engine is
Cocoa specific.

Reviewed-by: Samuel Rødal
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Thu, 4 Nov 2010 14:07:35 +0000 (15:07 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
  Give the toplevel widget a layout
  fix tests when using Qt in a namespace
  Fix tst_symbols auto test
  trivial: fix build
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  ...

11 years agoFixed elf2e32_qtwrapper when not using def files.
axis [Thu, 4 Nov 2010 12:51:44 +0000 (13:51 +0100)]
Fixed elf2e32_qtwrapper when not using def files.

RevBy:    Liang Qi
Task:     QTBUG-14952

11 years agoRemove code changes that were NOT intended as part of the fix
Sami Merila [Thu, 4 Nov 2010 13:27:39 +0000 (15:27 +0200)]
Remove code changes that were NOT intended as part of the fix

For some unknown reasons (read: missed git checkout -f), few code line
changes which were NOT part of fix for QTBUG-14331 crept into the
commit. These are now removed with this fix.

Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
11 years agoPrevent access to non-existent memory in QGL2PEXVertexArray
Topi Reiniö [Thu, 4 Nov 2010 13:20:02 +0000 (14:20 +0100)]
Prevent access to non-existent memory in QGL2PEXVertexArray

QGL2PEXVertexArray::addClosingLine() uses using QDataBuffer::add() to
add a QPointF at the end, with a const reference to another value in
the same array. As add() resizes and possibly relocates the buffer, an
already-released memory location may be accessed.

This change copies the value into a temporary variable before resizing
the array.

Task-number: QTBUG-14944
Reviewed-by: Samuel
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 4 Nov 2010 13:16:07 +0000 (14:16 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Update the offsets of the QToolBars inside

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Janne Koskinen [Thu, 4 Nov 2010 13:10:03 +0000 (15:10 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

11 years agoUpdate the offsets of the QToolBars inside
Fabien Freling [Thu, 4 Nov 2010 13:03:46 +0000 (14:03 +0100)]
Update the offsets of the QToolBars inside
the unified toolbar on Mac OS X.

Task-number: QTBUG-12818
Reviewed-by: Samuel Rødal
11 years agoWordwrap QInputDialog label in Symbian
Janne Koskinen [Thu, 4 Nov 2010 12:47:20 +0000 (14:47 +0200)]
Wordwrap QInputDialog label in Symbian

Enable wordwrapping for QInputDialog in Symbian to allow longer texts to
be displayed without cutting them off. Fixes issue with javascript
prompt not showing long texts.

Task-number: QT-4008
Reviewed-by: Sami Merila
11 years agoPrevent excessive seeks in xbm detection
Harald Fernengel [Thu, 4 Nov 2010 12:49:43 +0000 (13:49 +0100)]
Prevent excessive seeks in xbm detection

When auto-detecting an image type, the xbm handler would read
the entire file just to figure out that it's not an xbm. This patch
limits the read to maximum 4k and also breaks if line length >= 299.

Task-number: QT-4021
Reviewed-by: Robert Griebl
11 years agoOptimize and clean up QClipData::fixup()
Andreas Kling [Thu, 4 Nov 2010 12:14:47 +0000 (13:14 +0100)]
Optimize and clean up QClipData::fixup()

WebKit was hitting this function pretty hard in SVG space invaders demo:
http://croczilla.com/bits_and_pieces/svg/samples/invaders/invaders.svg

This patch cuts time spent in QClipData::fixup() from 6% to 2%.

Reviewed-by: Samuel Rødal
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 4 Nov 2010 12:22:48 +0000 (13:22 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  Add more microbenchmarks for QScriptEngine
  QNAM HTTP: Do not set cache headers when already set by user
  QNAM: Do not cache network connections per username.
  Refactor tst_QScriptValue::instanceOf
  Refactor tst_QScriptValue::getSetPrototype
  Refactor tst_QScriptValue::getSetProperty
  ...

11 years agoUse qtmain.lib to provide entry point for all Symbian applications
Miikka Heikkinen [Thu, 4 Nov 2010 10:23:54 +0000 (12:23 +0200)]
Use qtmain.lib to provide entry point for all Symbian applications

Using Open C's libcrt0.lib to provide entry point caused problems
for applications that launched other processes, as Open C retains a
handle to all launched processes even after said processes terminate.

Task-number: QTBUG-14735
Reviewed-by: axis
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Thu, 4 Nov 2010 09:58:02 +0000 (10:58 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Make qmake to pass all UTF-8 characters unchanged through parser.

11 years agoGive the toplevel widget a layout
Harald Fernengel [Thu, 4 Nov 2010 09:39:16 +0000 (10:39 +0100)]
Give the toplevel widget a layout

This ensures that the top-level will be large enough to view the text
edit.

11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Morten Engvoldsen [Thu, 4 Nov 2010 09:33:23 +0000 (10:33 +0100)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDoc: Correcting character escape bug
Morten Engvoldsen [Thu, 4 Nov 2010 09:32:26 +0000 (10:32 +0100)]
Doc: Correcting character escape bug