summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't need to wait that much.Alexis Menard2009-09-301-1/+1
| | | | Reviewed-by:TrustMe
* Be consistant between static method and regular QFileDialog contructor.Alexis Menard2009-09-302-0/+31
| | | | | | | | | The protected constructor of QFileDialog call selectAll() on the line edit. This constructor is only called by static methods. But the regular constructor didn't behave the same. Now it does :D. Task-number:QTBUG-4419 Reviewed-by:jasplin
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-3023-371/+616
|\
| * Make the test fail, not crash for now. A task is already open to fix it.Alexis Menard2009-09-301-1/+2
| | | | | | | | Reviewed-by:jesper
| * Fix auto-test build.Alexis Menard2009-09-301-0/+2
| | | | | | | | Reviewed-by:jesper
| * avoid JavaScriptCore C API functions being exported from QtScript libraryKent Hansen2009-09-301-0/+3
| | | | | | | | Reviewed-by: Simon Hausmann
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-302-2/+1
| |\
| | * Make the automaticReparenting autotest pass on Mac.Jan-Arve2009-09-301-1/+1
| | | | | | | | | | | | | | | On Mac, all autotests will use the release version of Qt, regardless of how the autotest was built
| | * Compile on VS2003Kent Hansen2009-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The compiler complained about ambiguity in calls to make_pair because there is also a "using std::make_pair" in the WTF namespace (wtf/HashTraits.h). Reviewed-by: Simon Hausmann
| * | Fixed qdoublespinbox undoRedo test case for Symbian.Janne Anttila2009-09-301-10/+20
| |/ | | | | | | | | | | | | | | Symbian does not have keysequene associated to redo functionality. Changed the test so that it checks if key sequence is associated to needed functionality and if not test is skipped and warning printed. Reviewed-by: Aleksandar Sasha Babic
| * Compile.Eskil Abrahamsen Blomfeldt2009-09-301-0/+72
| | | | | | | | Missed qdatastream_p.h in last commit.
| * Fix googlechat example when Qt is lacking SSL support.Simon Hausmann2009-09-302-2/+9
| | | | | | | | | | | | | | | | | | | | | | Don't build the googlechat example if QSslSocket isn't available. And even then also perform a run-time check and display an error page if SSL is not available. This is because the login into Google Chat works through an https website. Reviewed-by: Jesper
| * Fix floating point precision when using qreal with QDataStreamEskil Abrahamsen Blomfeldt2009-09-304-10/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A frequent bug when using QDataStream across platforms where the size of qreal is different (such as any desktop platform and an ARM device) is that you end up using different overloads for streaming the value in and out (e.g. operator>>(double) on desktop and operator<<(float) on ARM.) This can leads to crashes and data corruption. To avoid the problem, we define a single floating point precision for the entire data stream and allow this to be set by the user. The default is to use 64-bit precision for all floating point numbers. Reviewed-by: Samuel Reviewed-by: Thiago
| * Make the test more robust because pulse doesn't clean the temp dir.Alexis Menard2009-09-301-0/+10
| | | | | | | | | | | | I clean the directory i will use to be sure it is clean. Reviewed-by:TrustMe
| * Phonon/EffectFactory: Remove calls to QObject tr().Friedemann Kleint2009-09-301-8/+9
| | | | | | | | | | | | Replace them by calls to QCoreApplication::translate() to provide translators with context information. Reviewed-by: Frans Englich <frans.englich@nokia.com>
| * Install sub-attaq in the correct place.Alexis Menard2009-09-301-2/+2
| | | | | | | | Reviewed-by:TrustMe
| * Compile when one includes <QtGui/QtGui> without putting explicitly all Qt ↵Olivier Goffart2009-09-301-1/+1
| | | | | | | | subdirs in the include path
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-09-3014-363/+345
| |\
| | * Fix tst_QFontDialog::task256466_wrongStyle() autotest failure in Cocoa.Prasanth Ullattil2009-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fonts contain only styles other than Normal (or Regualr). If we try to retrive the font sizes for such fonts by passing an empty style string, the QFontDatabase will return a null list. This was causing the autotest to fail. This patch will make sure that a style is always selected in the QFontDialog. Reviewed-by: Olivier
| | * Stabilize and speedup QGraphicsItem and QGraphicsView and ↵Olivier Goffart2009-09-303-334/+309
| | | | | | | | | | | | QGraphicsProxyWidget test
| | * Fixed warning in public header:Olivier Goffart2009-09-301-0/+3
| | | | | | | | | | | | | | | | | | | | | qcommonstyle.h:87: warning: virtual void QCommonStyle::polish(QPalette&) was hidden qs60style.h:77: warning: by QS60Style::polish Reviewed-by: Jeremy
| | * Stabilize listview testOlivier Goffart2009-09-301-1/+3
| | |
| * | Ftp example application crashes (due to keypad navigation)Sami Merilä2009-09-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keypad navigation tries to calculate the minimal distance of next widget to the direction of pressed navigation key. This calculation in QWidgetPrivate::widgetInNavigationDirection dies not take into account that some widgets might have focusProxy setup. In the reported case, ignoring focus proxy means that QDialogButtonBox gets the focus and it hands it over to first button in its tab order. Unfortunately, this button is disabled 'Download' button. Now, when Select key is pressed, button action is triggered causing a crash. Solution is to skip widgets that have focus proxies in widgetInNavigationDirection. Task-number: QT-2177 Reviewed-by: Alessandro Portale
* | | Add redo keyboard shortcut for Symbian.Jani Hautakangas2009-09-301-2/+2
| |/ |/| | | | | | | | | | | Symbian had undo shortcut already defined so this will add redo shortcut to get symmetrical undo-redo Reviewed-by: axis
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-30149-664/+24632
|\ \
| * | remove two expected failuresKent Hansen2009-09-301-4/+0
| | | | | | | | | | | | The tests now pass after the last update of src/3rdparty/javascriptcore.
| * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-09-303-5/+10
| | | | | | | | | | | | jsc-for-qtscript-4.6-staging-30092009 ( e8f42cf0203bee0ba89a05e0e773d713782129b4 )
| * | Fix linking on windows, building qt in namespaceJarek Kobus2009-09-301-1/+3
| |/ | | | | | | RevBy: Thiago Macieira <thiago.macieira@trolltech.com>
| * Fix the sub-attaq menu (new game and quit).Alexis Menard2009-09-301-1/+5
| | | | | | | | | | | | | | | | | | Now QStateMachine can be a child of a QState but here in sub-attaq the code was not design for that so the code breaks. Task-number:QT-665 Task-number:QT-914 Reviewed-by:TrustMe
| * fix string builder for QT_NO_CAST_FROM_ASCII on Windowshjk2009-09-301-2/+13
| | | | | | | | Reviewed-by: thiago
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-304-35/+40
| |\
| | * Fixed some S60 installation documentation issues.Miikka Heikkinen2009-09-303-34/+39
| | | | | | | | | | | | | | | Task-number: QT-2204 Reviewed-by: Janne Anttila
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-3011990-102774/+1458345
| | |\
| | * | Fixed symbian-sbsv2 build break in apps using debug_and_release.Miikka Heikkinen2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Skipped addExclusiveBuilds function in debug_and_release.prf for all Symbian platforms, as it doesn't work with Symbian toolchain. Reviewed-by: Janne Anttila
| * | | Added sql driver deployment for qsqldriver autotest in Symbian.Janne Anttila2009-09-301-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | The sqlite driver is required to run this autotest, and using cetest requires that all plugins are deployed with deployment statements. Reviewed-by: TrustMe
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-09-308-160/+81
| |\ \
| | * | Fix a memory leak of EGLSurface's in QGLContextRhys Weatherley2009-09-301-2/+4
| | | | | | | | | | | | | | | | Reviewed-by: Julian de Bhal
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-09-305-153/+64
| | |\ \
| | | * | Convert OpenGL convolution filter to OpenGL2 paint engineRhys Weatherley2009-09-301-120/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The convolution filter was still using the old-style OpenGL1 method for interfacing to the paint engine. Reviewed-by: trustme
| | | * | Make QPF's implementation of alphaMapForGlyph() consistent.Rhys Weatherley2009-09-294-33/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QPF implementation of alphaMapForGlyph() was returning color values of RGBA = (a, a, a, 255) instead of (0, 0, 0, a), which was inconsistent with all the other font engines. This inconsistency caused some QPF-specific workarounds in the OpenGL and OpenVG paint engines. This change removes the workarounds and makes QPF generate the right colors from the start. Paint engines that ignore the color table or which don't use the alphaMapForGlyph() function (e.g. raster) are not affected. Reviewed-by: Paul
| | * | | (ODBC) Better fix for readonly result setBill King2009-09-302-5/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where a forwardonly result set would force forwardonly on the next query, despite what the user had explicitly set. Reviewed-by: Justin McPherson
| * | | Fixed error in notify() signal and totalTime() in QAudioInput andKurt Korbatits2009-09-308-11/+62
| |/ / | | | | | | | | | | | | | | | | | | | | | QAudioOutput. -The notify() signal was not firing the correct number of times. -The totalTime() on wince was incorrect (unit test). Reviewed-by:Justin McPherson
| * | Changed internal tr()'s to be QString::fromLatin1() in alsa builtin.Kurt Korbatits2009-09-292-22/+22
| | | | | | | | | | | | | | | | | | | | | Internal strings don't need translations, changed to use fromLatin1 instead. Reviewed-by:TrustMe
| * | Shorter button texts.Alessandro Portale2009-09-291-8/+8
| | | | | | | | | | | | | | | | | | They do not fit into landscape smallscreen. Reviewed-By: TrustMe
| * | Added standard dialogs to keypad navigation test.Alessandro Portale2009-09-292-28/+191
| | | | | | | | | | | | | | | | | | | | | QFileDialog::getOpenFileName(), QFileDialog::getSaveFileName(), QFileDialog::getExistingDirectory(), etc... Reviewed-By: TrustMe
| * | QString(" => QString::fromLatin1("Anders Bakken2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Espen Riskedal2009-09-293-3/+119
| |\ \
| | * | Skipping two test cases due to Open C bug.Aleksandar Sasha Babic2009-09-291-0/+6
| | | | | | | | | | | | | | | | | | | | In Open C 1.6 release there is a bug in mmap(...) function. The bug has been reported.
| | * | Restoring cases that have been lost.Aleksandar Sasha Babic2009-09-292-3/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to bad merge some of the cases were removed. They have been restored now. Some adaptation for Symbian platform was needed as well. We must not forget that local socket implementation is based on RSocket, and therefore similar to having TCP_SOCKET as basckend. So, in soe places it we had to give some time for events to propagate by introducing qTest::wait() lines.
| * | | Fix compile of anomaly for S60 3.1 SDKEspen Riskedal2009-09-291-1/+1
| |/ / | | | | | | | | | | | | | | | It seems that for 3.1 we need to explicitly link with insock.dll as well Reviewed-by: Aleksandar Babic