summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only set system style when it actually changesJens Bache-Wiig2009-04-021-1/+5
| | | | | | | | | | | This issue would cause Qt Creator and similar apps with proxy styles to loose their custom styling whenever any x11 system settings changed. This happened because we would re-read the settings and override the system style even if the system style did not actually change would be set on the application. We Task-number: 250199 Reviewed-by: ogoffart
* Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-1/+1
| | | | | | | Explicitly unset QTDIR_build, to make sure we generate Makefiles with real rules to call the extra tools. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-024-12/+19
|\
| * make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | | | | | | | i.e., use "", not <> and thus rely on the include path
| * re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992fOswald Buddenhagen2009-04-022-2/+8
| | | | | | | | | | | | | | this time, it can deal with directories which are absolute to start with. Reviewed-by: mariusSO
| * re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| |
| * fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| * fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
* | fixes empty tab after pdf file open, new tab after middle mouse clickkh2009-04-022-3/+57
| | | | | | | | | | Task-number: none Reviewed-by: --global
* | fixes empty tab after pdf file openkh2009-04-021-3/+10
|/ | | | | Task-number: none Reviewed-by: --global
* fixes empty tab after pdf file openkh2009-04-022-6/+17
| | | | | Task-number: none Reviewed-by: --global
* make the configured namespace part of QT_BUILD_KEYhjk2009-04-021-0/+3
| | | | | | | | | The eclipse integration is namespaced, but it pulls in system plugins like the oxygen style. This breaks as the (non-namespaced) style plugin does not find a suitable QApplication instantiated (only a namespace one is there) Reviewed-by: thiago Task-number: 250185
* Small changes in qmake's fileFixifyJoão Abecasis2009-04-021-9/+3
| | | | | | | Removed dead code and simplified conditionals. This should not otherwise change behavior or output of qmake in any way. Reviewed-by: mariusSO
* In qmake tests, allow child environment to be manipulatedJoão Abecasis2009-04-023-2/+18
| | | | | | ... without having to change the parent process's environment. Reviewed-by: mariusSO
* Spring cleaning in qmake testsJoão Abecasis2009-04-027-107/+49
| | | | | | | | | | And some indentation fixes in qmake itself. Fixes indentation; TRUE => true; FALSE => false; #includes and #defines cleanup; removes dead code; comments... and somewhere along the way marked a function static. Reviewed-by: mariusSO
* Remove dependency on Qt3 support from qmake testsJoão Abecasis2009-04-024-185/+67
| | | | | | | | | Qt3 support prevented the tests from running on Mac Cocoa. Also started some Spring cleaning (it's just around the corner!) and applied some YAGNI :-) Reviewed-by: NRC Reviewed-by: mariusSO
* Delete temporary file if copy was unsuccessfulJoão Abecasis2009-04-021-1/+4
| | | | | | | | | | | This is an untested bugfix -- comes solely from reading the code. In QFile::copy's fallback implementation a (temporary) file is created for block copying from the source file. When Qt is built without temporary file support this doesn't seem to be deleted in case of an error while block copying or renaming to the final destination. Reviewed-by: mariusSO
* Renaming a file does not change QFile's fileNameJoão Abecasis2009-04-021-0/+5
| | | | | | | | | | QFile made no attempt to reset the file name on a rename. We now reset the fileEngine's fileName if it was able to handle the rename. Otherwise, we call setFileName, which will result in reallocation of the fileEngine. Task-number: 244485 Reviewed-by: mariusSO
* QFile::rename didn't always return false when method failedJoão Abecasis2009-04-021-3/+9
| | | | | | | | | The fallback implementation for rename would return true in some situations where the move failed. Also the destination file might be created and left there in these cases. Task-number: 244500 Reviewed-by: mariusSO
* cosmetic bug in qmake msvc_nmake generator fixedJoerg Bornemann2009-04-021-3/+3
| | | | | | | When generating nmake makefiles, the same inference rules were generated several times. Reviewed-by: mariusSO
* Completed 4.5.1 changelog for Designer/uic.Friedemann Kleint2009-04-021-2/+12
|
* Doc - fixing a broken link in the documentation of QWebPageKavindra Devi Palaraja2009-04-021-1/+1
| | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Improved stylesheet support for setting background and foreground rolesJens Bache-Wiig2009-04-024-23/+19
| | | | | | | | | | This makes sure that style sheets set both ButtonText and WindowText roles for all widgets. This fixes among other things the fact that you could not configure text colors for combo box popups on Mac, Gtk and CleanLooks or set the background for the whole scrollbar. Task-number: 160713 Reviewed-by: ogoffart
* Fixing some CoreText errors.Norwegian Rock Cat2009-04-022-14/+19
| | | | | | | | | | | | Apparently CoreText is too good for us and always gives us fractional information. Which would be food for design metrics, but not good for drawing to the screen. The upshot of it is that we do the ceiling of every value we get. This is as stop gap solution for the moment. Things in Creator should look better now. Also added the ability to disable kerning. Reviewed-by: Simon Hausmann
* Doc: Added a note about copying by value in QMetaProperty and included ↵David Boddie2009-04-021-3/+15
| | | | | | | | | details about BlockingQueuedConnection in QMetaObject::invokeMethod(). Task-number: 187869 Task-number: 216742 Reviewed-by: Thiago Macieira Reviewed-by: Morten Sørvig
* Doc - moving this file to the Creator branch instead.Kavindra Devi Palaraja2009-04-021-179/+0
|
* Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-025-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-04-02 Takumi Asaki <takumi.asaki@nokia.com> Reviewed by Simon Hausmann. Fix pre-edit handling of text fields with input methods. The input method sends an empty preeditString() if all characters of the preedit should be deleted. So inputMethodEvent() has to use preeditString() if it's empty. * Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent): 2009-03-30 Simon Hausmann <simon.hausmann@nokia.com> Rubber-stamped by Tor Arne Vestbø. Document that setHtml/setContent loads only the html/data immediately, not external objects. * Api/qwebframe.cpp: * Api/qwebview.cpp:
* duplicate message handling improvementsOswald Buddenhagen2009-04-029-68/+77
| | | | | | | | | | | | | | | - lrelease will not abort on duplicates any more - lconvert now gets noisy, but only if messages within one file are duplicated (combining files with identical messages is ok) - lupdate stays silent, but will eliminate duplicates again - consolidate handling of dual-encoded and duplicate messages - for performance - instead of the format loader, now the app is responsible for calling the duplicate handler. this allows for the fine-grained control necessary for optimal performance. Task-number: 247738
* optimize duplicate resolutionOswald Buddenhagen2009-04-021-5/+26
| | | | use pointers in the index hash to avoid needless allocs and copies
* Doc - fixed a typo: iterartor -> iteratorSimon Hausmann2009-04-022-4/+4
| | | | Reviewed-by: Trust me
* Fix slowdown regression in QGraphicsItem::ItemCoordinateCacheAndreas Aardal Hanssen2009-04-021-4/+7
| | | | | | | | | | | | | | | Right before Qt 4.5.0 was released, Alexis and I submitted change 7e9b000ee418ef2d9c8fadb2c6b8870e0335bd5e, which accidentally introduced a rounding error causing items whose bounding rect contains fractional numbers (e.g., QRectF(-0.5, -0.5, 11, 11)), to always be drawn with a one-pixel strech even if otherwise untransformed. This caused a significant slowdown for pixmap items and any shape item that uses almost any pen width != 0, if they enable ItemCoordinateCache. The fix is to consistently use the aligned rectangle both when generating the cache pixmap and when drawing it. Reviewed-by: Alexis
* Simplify WebKit import scriptSimon Hausmann2009-04-021-16/+19
| | | | | | | Don't require any arguments by default, get the repo path from git config and updated the default tag. Reviewed-by: Trust me
* Cleanup and minor fixes of db testcase support codeBill King2009-04-021-20/+19
|
* Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().David Boddie2009-04-011-6/+10
| | | | | Task-number: 240164 Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
* Doc: Updated the deployment documentation with the QtScriptTools module and ↵David Boddie2009-04-011-5/+8
| | | | | | | references to Phonon documentation. Task-number: 212939 Reviewed-by: TrustMe
* Doc: Trivial fixes.David Boddie2009-04-011-4/+4
| | | | Reviewed-by: TrustMe
* Doc: Minor language fixes and tidying.David Boddie2009-04-013-5/+5
| | | | Reviewed-by: TrustMe
* don't invoke the current item without selectionkh2009-04-011-18/+23
| | | | | Task-number: none Reviewed-by: hjk
* don't open the TopicChooser if no link is avaliablekh2009-04-012-35/+23
| | | | | Task-number: none Reviewed-by: hjk
* Doc - clarified that QMessageBox's predefined icons are not defined inKavindra Devi Palaraja2009-04-011-16/+16
| | | | | | | QMessageBox, but provided by the style. Task-number: 249946 Reviewed-by: TrustMe
* Marked QWidget::resetInputContext() function as obsolete.Denis Dzyubenko2009-04-011-4/+8
| | | | | | | | | Fixed the behavior of the function that was broken by me some time ago. But anyway this function is for convenience only since QInputContext that operates on the widget is available to the user directly. Reviewed-by: Prasanth Ullattil
* Removed obsolete internal function that focuses input context.Denis Dzyubenko2009-04-013-25/+0
| | | | Reviewed-by: TrustMe
* Input Method cannot be enabled in License Wizard and Class WizardDenis Dzyubenko2009-04-011-1/+2
| | | | | | | | | | | Input methods didn't work properly wor widgets inside QWizardPage because the widget got focus before it was shown and input context wasn't initialized properly. The fix is to postpone qinputcontext->setFocusWidget call until the widget is created (input context will be initialized in the QWidget::create_sys function). Task-number: 244604 Reviewed-by: Prasanth Ullattil
* Subject: Fix typo in CompositionMode sectionAndy Shaw2009-04-011-1/+1
| | | | Reviewed-by: TrustMe
* strip fragment and other parts from url in case of pdfkh2009-04-011-8/+16
| | | | | Task-number: part of 238496 Reviewed-by: hjk
* QTextStream autotest: do not test against "imap.troll.no"Peter Hartmann2009-04-011-1/+3
| | | | | | ... but test against the test server. Reviewed-by: ogoffart
* QNetworkInterface: fix listing of all interfacesPeter Hartmann2009-04-011-3/+3
| | | | | | | | Before, we returned 0 for many interfaces because we picked up the IPv6 address regardless whether it was 0 or not. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: 249312
* QComboBox with Qt::NoFocus triggers a crash.Prasanth Ullattil2009-04-011-3/+7
| | | | | | | | | The showPopup() from a combobox triggers a crash. This happens only for a combobox which dosen't accept focus and it has been recreated. This is due to some invalid widget pointer stored in the input context. Task-number: 249576 Reviewed-by: ddenis
* normalize file namesOswald Buddenhagen2009-04-012-2/+2
| | | | | | makes tool tips less ugly Task-number: 246114
* do not crash upon dnd-ing text into non-focused lineeditOswald Buddenhagen2009-04-011-0/+2
| | | | Task-number: 249519