summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Olivier Goffart2009-05-134-139/+192
|\
| * Correcting bug in QString::fromWCharArray documentationMorten Engvoldsen2009-05-121-1/+3
| | | | | | | | | | | | | | Clearifying details about bit size of the wchar_t input and the way they are handled. Task-number:227709 Rev-by: Marius Storm-Olsen
| * QFSFileEngine: Fix access to uninitialized memoryJoão Abecasis2009-05-111-1/+1
| | | | | | | | Reviewed-by: Peter Hartmann
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-111-20/+86
| |\
| | * Set the instruction set when building on Debian's Linux/MIPS portBradley T. Hughes2009-05-111-20/+86
| | | | | | | | | | | | | | | | | | | | | | | | We use MIPS2 instructions in the inline assembler, so we need to make sure that the assembler is informed of this. Task-number: 253275 Reviewed-by: thiago
| * | qdoc: Fixed qdoc errors, or tried to.Martin Smith2009-05-111-117/+102
| |/
* | Add a AA_MacDontSwapCtrlAndMeta application attribute.Norwegian Rock Cat2009-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help undo the some magic that is in the Qt/Mac port. Qt automatically flips the Meta and Control keys on Mac. This is a "feature" that makes porting older programs that don't use standard shortcuts easier as Ctrl and Command usually map to the same shortcuts in the application. The upshot of this is that I need to strip the text() out of key events if they contain the Control or Meta modifier. This causes much headache for anyone writing a terminal emulator. Though they would still have to write special code because the keys are swapped anyway. This allows people to write the terminal emulator where hitting the Control key will really send a Control key modifier. We've also done the extra work to ensure that standard shortcuts work correctly regardless of what the value of the attribute is. That is, if you specify QKeySequence::Cut for a shortcut you can always hit Command+X and things will work.
* | Remove a warning on gcc.Alexis Menard2009-05-111-1/+0
| | | | | | | | | | | | We don't need Q_D if we don't use the d pointer. Reviewed-by:TrustMe
* | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-114-4/+4
| |
* | Compilation for debug buildsOlivier Goffart2009-05-111-12/+11
| |
* | Merge branch '4.5'Thiago Macieira2009-05-116-35/+34
|\ \ | |/
| * QDataStream: Small doc errorMarkus Goetz2009-05-081-1/+1
| | | | | | | | | | Task-number: 253179 Reviewed-by: TrustMe
| * Fix leak of file descriptors in QTemporaryFileJoão Abecasis2009-05-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | Using setFileName in QFile::copy (introduced recently) has a nasty side-effect of leaking file descriptors in QTemporaryFile. This happens because the code assumes the file has been closed. In QTemporaryFile, we need to explicitly call native file engine close. Test case by Thiago. Bug report from Arora developers. Reviewed-by: thiago
| * compile?Harald Fernengel2009-05-081-1/+1
| |
| * Added further explanation on the note about stdin and QTextsStream::atEnd()Morten Engvoldsen2009-05-081-2/+4
| | | | | | | | | | | | | | Explained why you cannot use stdin and atEnd() together. Task-number:251171 Rev-by: Andreas Aardal Hanssen
| * Fix reentrancy of QVector and QStringOlivier Goffart2009-05-082-2/+2
| | | | | | | | | | | | The d->capacity could be modified even if ref was more than 1 Reviewed-by: Marius Storm-Olsen
| * Fixes QDir not reentrantOlivier Goffart2009-05-081-29/+18
| | | | | | | | | | | | | | | | | | | | qt_cmp_si_sort_flags could be read and written from different threads. Use qStableSort with functor instead of libc's quicksort. Found with helgrind on kdevelop Reviewed-by: Marius Storm-Olsen
| * Revert "Added comment to QTextStream - clarification of the documentation"Morten Engvoldsen2009-05-081-2/+1
| | | | | | | | This reverts commit da1416cef6b1d24156739ded101df895ee4e80d9.
* | Fixed resetting error mode on Windows on error when stat'ing a file.Denis Dzyubenko2009-05-111-2/+0
| | | | | | | | | | | | | | | | We shouldn't return since the SetErrorMode was called and we need to reset it back afterwards. Patch-by: ritt.k Reviewed-by: mauricek
* | Faster slot disconnection while destroying of QObjectOlivier Goffart2009-05-112-150/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | Destroying a QObject which is connected to many signals was slow. We had to loop over all the ConnectionsList of all the connected object to remove the connections. (in QObjectPrivate::removeReceiver) The idea is to now use lists of pointer to Connection both in the connection list, and in the list of senders. So clearing the connection should be faster. Task-number: 251097 Reviewed-by: Brad
* | Fixed leak of plugin instancesJoão Abecasis2009-05-081-1/+18
| | | | | | | | | | | | | | | | | | | | It seems that plugins were never explicitly unloaded, resulting in leaks of the instance object. Added a static deleter to ensure deletion on exit. The QPointer (previously in place) ensures we don't do a double-free nor try to access an invalid pointer. Task-number: 253013 Reviewed-by: mariusSO
* | Fix leak of global dataJoão Abecasis2009-05-081-0/+9
| | | | | | | | | | | | | | Static variable was dynamically allocated but never freed. Task-number: 253013 Reviewed-by: Thiago
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-062-1/+4
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Added comment to QTextStream - clarification of the documentationMorten Engvoldsen2009-05-061-1/+2
| | | | | | | | | | | | Explained why you cannot use QTextStream::atEnd with stdin. Task-number:251171
| * Fix memory leak in QFutureMorten Sørvig2009-05-051-0/+2
| | | | | | | | | | | | | | | | | | The held results were not cleared by QFutureInterface::operator=(QFutureInterface) Add call to resultStore().clear(), similar to the destructor. This needs to be done in the header since we know the template type here. Task-number: 252208 Reviewed-by: brad
* | Use the new QTextCodec::codecForUtfText in qtextstream to detect theDenis Dzyubenko2009-05-041-7/+2
| | | | | | | | | | | | utf encoding by BOM. Reviewed-by: Simon Hausmann
* | When data was copied from Mozilla Firefox to Qt, the text format was not valid.Denis Dzyubenko2009-05-042-12/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mozilla encodes the text/html format in UTF16 and adds a BOM, however it doesn't specify the charset in the html header. The fix is to guess the encoding by either charset in the html header or BOM for text/html format, or by BOM for non html formats. This commit adds a new public function QTextCodec::codecForUtfText() which can be used to guess encoding out of the BOM. Task-number: 250555 Reviewed-by: Benjamin Poulain Reviewed-by: Simon Hausmann Reviewed-by: Andreas Aardal Hanssen
* | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-042-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOlivier Goffart2009-05-042-7/+3
|\ \
| * | prefer macro over stubMaurice Kalinowski2009-05-042-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Windows Mobile does the same, thus we will not have double definitions or such - COINIT_MULTITHREADED is the default, meaning that 0 usually expands to it. Just be on the safe side and be more precise. Task-number: 237029 Reviewed-by: joerg
* | | Merge commit 'origin/4.5'Olivier Goffart2009-05-042-90/+25
|\ \ \ | |/ / |/| / | |/ | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| * Greatly reduced the complexity of the boilerplate function.Thiago Macieira2009-05-041-90/+17
| | | | | | | | | | | | | | | | I found out that all I needed to load the proper libraries was to add a string to the ".interp" section of the ELF executable containing the path to ld.so Reviewed-By: Marius Storm-Olsen
| * Added comment to clearify the use of indexes.Morten Engvoldsen2009-05-041-0/+8
| | | | | | | | | | | | | | Added a comment about the use of negative indexes. Task-number: 249344 Rev-by: Marius Storm-Olsen
* | Fixed QFile::copy/rename fail after initial failed attemptJoão Abecasis2009-04-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | These functions were checking the error state after calling close(), without first resetting the error state. Turns out close() only resets the error state if isOpen() returns false. Also, the fallback for the copy operation opens the file for reading but wasn't closing it again afterwards. Now fixed. Added autotests to cover these situations. Reviewed-by: MariusSO
* | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and ↵Marius Bugge Monsen2009-04-291-0/+6
| | | | | | | | | | | | | | | | | | QTileRules struct. Implements a function to allow drawing CSS3-like border-images (also known as nine-grid images). Next step will be to convert the CSS-style code to use this function for drawing border-images. Task-number: none Reviewed-by: jbache
* | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+9
|\ \ | |/
| * performance improvement of isUncRoot in qfsfileengine_win.cppJoerg Bornemann2009-04-281-2/+9
| | | | | | | | | | | | | | We always called QStringList::split in this function, which was just expensive. Reviewed-by: mauricek
* | Compile Warnings removed in canConvertThierry Bastian2009-04-281-2/+3
| | | | | | | | | | | | | | | | These were caused by a comparison between QVariant::Type and QMetaType::Type. We're using QMetaType::Float because QVariant have no such Float value Reviewed-by: denis
* | Fixed to float support in QVariantThierry Bastian2009-04-271-25/+33
| | | | | | | | also added autotests
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-242-5/+2
|\ \ | |/
| * Return the correct MIB number for TSCII. When the code wasFrans Englich2009-04-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | written, IANA hadn't assigned one. Requested/spotted by Nokia i18n team. Task-number: 251790 Reviewed-by: Brad Reviewed-by: Denis AutoTest: In this submit.
| * Alias for QUtf16Codec is wrong.Frans Englich2009-04-241-3/+1
| | | | | | | | | | | | | | | | Requested/spotted by Nokia i18n team/Darpan. Task-number: 252102 Reviewed-by: Denis AutoTest: In this submit.
| * Change Qt version number to 4.5.2Thiago Macieira2009-04-241-2/+2
| | | | | | | | Reviewed-By: TrustMe
* | Remove the Direct3D engine.Gunnar Sletta2009-04-241-8/+7
| |
* | Merge branch '4.5'Thiago Macieira2009-04-232-2/+8
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Fixes for QByteArrayMatcherJoão Abecasis2009-04-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy constructor and assignment operator lose data: pointer to content and the length of content also need to be copied over. QByteArrayMatcher::pattern() would return a null byte array if instance was initialized with c-string. Changed default constructor to explicitly initialize pattern length to zero. The bug in the assignment operator is a regression against 4.4.3. Task-number: 251958 Reviewed-by: MariusSO Reviewed-by: paul
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-234-6/+8
|\ \ | |/
| * Allow QThread to start a QTimer and QEventLoop before QCoreApplication is ↵Bradley T. Hughes2009-04-234-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructed Fix a regression from 4.3 to 4.4 that prevented QThread from starting timers and event loops before QCoreApplication was instantiated. Even though this is documented not to work, it seems that people have been relying on it. This reverts commit e52e5acdfa198cd079bbfe3a9302debf46c7cadd which attempted to work around not calling g_thread_init() multiple times. The proper fix is to serialize the g_thread_supported() checks in the Glib event dispatcher. Task-number: 248191 Reviewed-by: denis
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-232-11/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h