summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* qdbus_loadLibDBus: remove unneeded volatile qualificationMarc Mutz2012-08-251-1/+1
| | | | | | | | | The variable is only ever accessed under mutex protection, and doesn't otherwise look like it could be changed by the hardware, so remove the volatile qualifier. Change-Id: I3bb00ed6f8017d662bbf73425a70d52116cc9297 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix doc: qglcolormap is not the opengl moduleFrederik Gladhorn2012-08-241-1/+1
| | | | | Change-Id: I134aeafbabc62e36da20e0a6df667b6c1aa0c477 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* fbbackingstore: Don't overload inherited virtual functionKent Hansen2012-08-242-3/+2
| | | | | | | | The QPlatformBackingStore::endPaint function does not take any parameters. Change-Id: If15d7824d65a52c38332c6676c12a954469a58ab Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Test for quadratic behaviour when rendering long line in QTextEditOlivier Goffart2012-08-231-0/+36
| | | | | | | | | | | | QTextEdit showing long lines using lots of text format (for example with a syntax highlighter) used to expose a quadratic behaviour which make it impossible to edit files with long lines. It was fiexed in the few previous commit Task-number: QTBUG-8389 Change-Id: Ib7203497a7699a85ae1dfb70fe65d5fb36884b58 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix performence problem while shaping a lines with many scriptsOlivier Goffart2012-08-231-1/+1
| | | | | | | | | Fix quadradic behaviour regression introduced in commit 2e6b8b4734710377e25c199e3ff7865628e7d723 Task-number: QTBUG-22275 Change-Id: I343452c6b1cd0e571770e5dadd3cd6fd3167c96d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Speed up QTextEngine::setBoundaryOlivier Goffart2012-08-231-6/+14
| | | | | | | | | | | | | | Before, setBoundary was O(N), now it is O(log N) assuming the boundaries are added in order. (splitItem might still be linear because of the call to QVector::insert) This speeds up a lot QTextEngine::addRequiredBoundaries when there is a lot of addFormats. (For example if there is a very long line with syntax highlighting) Task-number: QTBUG-8389 Change-Id: I10c9fca72343f46db24b1d4f519f7747188d4009 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Speed up QTextEngine::resolveAdditionalFormatsOlivier Goffart2012-08-231-2/+65
| | | | | | | | | Don't call the linear QTextEngine::format in the loop. Instead, keep track of the current formats by indexing their start and end position. Task-number: QTBUG-8389 Change-Id: I89c18b804111edfab6254442cbee33da39d1a273 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* doc: Fix some qdoc warningsEskil Abrahamsen Blomfeldt2012-08-232-10/+12
| | | | | | | | | | | QDoc doesn't supported nested tags, and there doesn't seem to be any way to trick it into thinking you've mentioned the argument (\omit didn't work), so actually rephrasing is the only way to kill the warning. Also add a const modifier to a signature to make it match the declaration. Change-Id: Ie02a488c42565205e827602959111c53e2d05a83 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Compile without the deprecated filterEvent functionThiago Macieira2012-08-231-1/+1
| | | | | | | | Use the filterNativeEvent function, which also takes the name of the event. Change-Id: Ifa3dd6285a2a526b5c3de5a86a74ead706534759 Reviewed-by: David Faure <faure@kde.org>
* xcb: fix unused static warningMarc Mutz2012-08-231-0/+2
| | | | | | | | | The variable ptrXcursorLibraryLoadCursor is only used in code wrapped in XCB_USE_XLIB. Change-Id: If0b4997ac6e80a3709263d9793d1ca0dfd5907f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* linuxfb: remove unused functionMarc Mutz2012-08-231-10/+0
| | | | | | | | debug() isn't even referenced in commented-out code, and GCC warns about it being unused, so remove. Change-Id: I2830b7932e18cdd3643925973995bea7fea9f277 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QSystemTrayIcon: fix narrowing warningMarc Mutz2012-08-231-1/+1
| | | | | | | | | | | | GCC complained: warning: narrowing conversion of ‘((QSystemTrayIconSys*)this)->QSystemTrayIconSys::<anonymous>.QWidget::winId()’ from ‘WId {aka long long unsigned int}’ to ‘long int’ inside { } [-Wnarrowing] Change-Id: I63908c884b51db203ee0ed659a152af77c295292 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QNetworkDiskCache: avoid a 31-bit truncationMarc Mutz2012-08-231-1/+1
| | | | | | | | | Network operations whose content size exceed 2G are not unheard of, and they probably shouldn't be cached, so use the correct toX() function, one that doesn't truncate the value in the header. Change-Id: Ie4e68a3120c85952dd2cc9feb73c5844e20b9aa3 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* doc: Remove documentation for removed functionEskil Abrahamsen Blomfeldt2012-08-231-12/+0
| | | | | | | | Function was removed in 1582407fc782c0befd0760633324dd5c206524a1, but the documentation was left behind. Change-Id: Ib59197221e3be0e13db958ab3efdcc95b7c52452 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtNetwork: declare some classes as sharedMarc Mutz2012-08-2314-2/+38
| | | | | Change-Id: Ib3eaba59836529ad0cf8e4353b54dd0cd31fd1ad Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* qmake: fix manifest resource for non-trivial target namesJoerg Bornemann2012-08-231-1/+1
| | | | | | | | | The Microsoft Resource Compiler bails out if the rc file contains non-trivial file name references. In particular it doesn't like dashes in file names. We're now always quoting the file name. Change-Id: I67b8d2c13010a0b2ec26cac915ebd1be95f1c274 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Extract the QMetaMethodPrivate::ownMethodIndex method.Stephen Kelly2012-08-231-5/+11
| | | | | | Change-Id: Ic96e3582ff4332ac489f7c51ed40eb1b1a0ac42d Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixed missing window decorations on compiz.Samuel Rødal2012-08-231-3/+1
| | | | | | Task-number: QTBUG-26954 Change-Id: I6981338d4bbc9cf1440c9d67e9d034e0553dfeae Reviewed-by: Jason Barron <jason.barron@nokia.com>
* Make QAbstractItemModel::sibling virtual.Stephen Kelly2012-08-233-17/+24
| | | | | | | | | | | | | | | | | | | This would allow implementations to create an optimized way to create sibling indexes. A typical pattern of QAIM implementation is to use the same internalPointer for each row of a subtable of a model (such that the internalPointer is related to the common parent of each set of rows) and differentiate on the row value in the QModelIndex. Alternatively, it is also common to have the internalPointer correspond directly to the row value for the QModelIndex. In both cases it is possible for the implementation to optimally create a sibling QModelIndex in the same column as a known row. Provide a virtual method for them to do so. Change-Id: I3b076abcd5f6087a4cb108fbc6dceeef15529987 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make sure we don't get duplicated doc pages.Lars Knoll2012-08-231-5/+0
| | | | | | | | | \group generates a page with the same name as the \page comand afterwards. Change-Id: Iaca6da21485532c8c3b13982bd06a06f3dbc0375 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Doc: Add \inmodule QtCore to all QtCore class doc bodiesThiago Macieira2012-08-23142-11/+235
| | | | | Change-Id: I19100755c97cc155c76a859e19940e9f9222d34e Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Doc: Add \inmodule QtDBus to all QtDBus class doc bodiesThiago Macieira2012-08-232-0/+9
| | | | | Change-Id: I0aa273c355314effd563cfeda74ce7bacbef3db8 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Doc: replace occurrence of \starslash in widget docsAndy Nichols2012-08-231-1/+1
| | | | | Change-Id: I93c370e3d53b955057741bc3bf503e781fbb6244 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* change http example default URL to http[s]://qt-project.orgJeremy Katz2012-08-231-2/+2
| | | | | | | This example used to refer by default to qt.nokia.com. Change-Id: Iecb682d0deb6270da91baf26897d44b16b39d09e Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Doc: Fix snippet and example referencing widget examplesAndy Nichols2012-08-23109-1516/+1516
| | | | | | | | Widget examples were moved into a widgets subfolder, but qdoc references were not updated. Change-Id: Id2a4573e723745b9827c664c852807d6116f8f6d Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* tst_QMutex: add markers to the tryLock testsThiago Macieira2012-08-231-6/+13
| | | | | | | | Just to make it clear which two sections go together. Change-Id: If3724d1c84172a61bdd7931cc567f4b7140d4f8a Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove remaining bits of deprecated QInputPanelPekka Vuorela2012-08-237-145/+7
| | | | | | | Introduced during Qt5 development and renamed to QInputMethod. Change-Id: If6744648dc98b779e65c449ae32626db574181df Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
* Remove unused inotify includes in the filesystem watcher testThomas McGuire2012-08-231-8/+0
| | | | | | Change-Id: I346ef6ccf7b09390bef6d35c82ecee6dee1711fc Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* ICU: Fix crash in codecForMib(2107)Kai Koehne2012-08-232-0/+12
| | | | | | | | | | | | availableMibs() unconditionally adds 2107 to the list of mibs. The patch ensures that codecForMib() also knows about this special TSCII codec. (Note that the autotest only really checks this code path if only this test case is run. The other tests already fill the internal codec cache otherwise). Change-Id: Id987d7cecd5f5700cca75e9b85b37011f8e5c622 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove qWaitForWindowShown(QWindow*) overload.Stephen Kelly2012-08-232-18/+0
| | | | | | | | The QWindow* overload was introduced for Qt 5.0, but is unused already. Change-Id: Ic07f19eac87bc93a589017407668760fceb2f632 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* A few more random documentation fixesShawn Rutledge2012-08-234-18/+28
| | | | | | | @p replaced by \a, \QD replaced by {Qt Designer}, couple of enums etc. Change-Id: I315510690bf52e42db519292b4122fa24c73bbc9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* tst_QTreeView: fix unused variable warningMarc Mutz2012-08-231-1/+1
| | | | | Change-Id: Idf18e4615754d3b7b8a09d6fdec91344a7408c18 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* De-inline QVariant(float)Harald Fernengel2012-08-232-1/+4
| | | | | | | | | All QVariant constructors are not inline, so change QVariant(float) as well. This allows for refactoring of QVariant during lifetime of Qt 5 without breaking QVariant(float) case. Change-Id: Icd1fc331a1ef8a2872be811aa7d1160406038f06 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix bug in configure where Qt did not compile with QT_ICONV=noJan-Arve Saether2012-08-231-15/+5
| | | | | | | | | | | It did not compile because at the time qconfig.h was preprocessed, QT_NO_ICONV was already defined, causing the #define QT_NO_ICONV to fail. It should be guarded like most other defines in qconfig.h. Also fix QT_CUPS=no, QT_ICONV=no, QT_GLIB=no, QT_NOTIFY=no and QT_LARGEFILE_SUPPORT=64 the same way. Change-Id: Ic9e0295756c35cb7c62e18eb9b63b1410e7de051 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move Qt::CursorMoveStyle docs to the right file.Frederik Gladhorn2012-08-232-15/+15
| | | | | | Change-Id: I26cc7336b33495a2649285cfeddeadec62e94d83 Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix accessibility unit test compilationPekka Vuorela2012-08-232-3/+3
| | | | | Change-Id: I72c931e0704175b6b48d66a6df54784bcec6860c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Logging: make qEmergencyOut() not allocate from the heapMarc Mutz2012-08-231-11/+38
| | | | | | | | | | | | | | | | | | | | | Commit 6e6b74c0 introduced heap allocation in the form of QString::fromLatin1().utf16() into qEmergencyOut(), a function that's called in OOM situations and in cases where another exception is still in flight. Luckily, QString::fromLatin1().utf16() is just a funny way of copying an array of chars into an array of wchar_ts, so we do that manually now and use a static wchar_t buffer. While at it, also throw text elision into the mix. This commit also fixes the message passed to _CrtDbgReportW(). What should be displayed is the emergency_buf, not the format string. Also remove a similar allocation in qt_message_output(). Change-Id: I2c44a298fc0927bb992de4977a7e4a7b47b16b26 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Simple optimisation in toLocal8Bit(): call codecForLocale once onlyThiago Macieira2012-08-231-6/+9
| | | | | | | | | The function is only slow the first time we call it, but there's no reason we can't do this simple optimisation anyway. Change-Id: Icacbbeb340838b32f5278b76d1860ad22dc9f7b7 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix transformation in eglfs backingstoreLaszlo Agocs2012-08-221-2/+2
| | | | | | | | | | | | While not visible with forced-fullscreen windows, the formula used to set up positioning on the Y axis is wrong. (with the GL coordinate system Y goes 1..-1 when moving top-to-bottom) Taken from kms' version of the backingstore which had the formulas corrected. Change-Id: I460a4eec925e47b08453af4e093d719567af22ea Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove deprecation from enumerations in QtGui.Friedemann Kleint2012-08-222-2/+2
| | | | | | | | | | | | Referencing them in a (deprecated) function declaration causes a deprecation warning to be emitted each time the header is included, which causes a massive amount of warnings for qevent.h. It should be sufficient to deprecate them in the documentation and to deprecate function using them. Change-Id: I531b7c893e73428703cfb302615bff382abce54f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move the QT_COMPILER_SUPPORTS_xxx defines to qconfig.hThiago Macieira2012-08-223-14/+35
| | | | | | | | | | | | | | | | This reduces dramatically the command-line for compiling Qt sources. These are private macros, only to be used by Qt's own modules, so the compiler setting is either the same or, possibly, better. In other words, in the worst case, when compiling a module with a better compiler than for qtbase, such module might not enable all the functionality it could otherwise do. If we switch to a buildsystem that can support this properly in the future, these macros should be removed. Change-Id: I71f2d12ec98c9dd40eaab9de4a17446bd1066020 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tst_QColumnView: fix unused variable warningMarc Mutz2012-08-221-1/+0
| | | | | Change-Id: I41a71faa64a20cebab058cf69181104eceea2339 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Optimize QAbstractItemModel::sibling a bit.Stephen Kelly2012-08-221-1/+1
| | | | | | | | QModelIndex::sibling has a simliar optimization. Change-Id: Ic0717d480ba0d46a4c0c88064bc9eda4c4ffe6f6 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* qmake: fix embedding of generated manifests in debug modeJoerg Bornemann2012-08-221-5/+4
| | | | | | | | | | | The existence of the manifest backup is used as a marker to decide whether to embed the manifest in a second link step or not. If it's present, the embedding took place in the first link step. If it's not present, we must link again incrementally. That logic was implemented faulty. Change-Id: I10154dbbbe70c7981795ac66d46a166907ba13ec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make keyboard search work in the current column, not only the first.Stephen Kelly2012-08-222-0/+35
| | | | | | | Task-number: QTBUG-26540 Change-Id: I1c365aeb013f5ddedd0589aa4c4844be759a3882 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix indexAbove and indexBelow to return indexes in the correct column.Stephen Kelly2012-08-222-17/+41
| | | | | | | | They used to always return indexes in column 0. Change-Id: I2cf4239e0a975b37548de00a1deb916fcd88b4c7 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add -pipe option of win32-g++'s QMAKE_CFLAGSYuchen Deng2012-08-221-1/+1
| | | | | Change-Id: Iad155d6340666283a31f82f8c7381f23018f7e40 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make configure set up QMAKE_DEFAULT_{INC,LIB}DIRSOswald Buddenhagen2012-08-223-4/+22
| | | | | | | | | | | | | | hard-coding it in unix.conf was no particularly good idea for hopefully obvious reasons. the windows version is so far just a stub that does what the makespecs hard-coded - more doesn't seem worth the effort. the guys interested in x-building may want to rectify it at some point, but it's not going to be easy. Change-Id: I8fedd841a8416f8c0c57018752eae9510b5d00d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: fix generated rc file for embedding manifestsJoerg Bornemann2012-08-221-2/+2
| | | | | | | | | The rc file is in the same directory as the manifest file. Therefore the include must consist of the filename and must not include the file's path. Change-Id: I4f5ac11b131f39ea8c425aca93fcf82d150c0204 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up borders in cleanlooksJens Bache-Wiig2012-08-221-16/+5
| | | | | | | | | This aligns the dockwidget appearance in cleanlooks with that we use for Gtk style. It should look a lot cleaner this way as most of the borders were redundant. Change-Id: Idf20a105f583ca8cdbba0bcb6f22b298d53cc40d Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:06:42 +0000