summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-144-3/+23
|\
| * Fix libiconv support on FreeBSD.Raphael Kubo da Costa2009-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason iconv support was broken in Qt 4.5 on FreeBSD, and this patch was made to fix that. Original patch by Max Brazhnikov <makc@freebsd.org>. Original message: Enable libiconv support. Didn't get where the real problem is, but using UTF-16LE/BE as default encoding (see patch) fixes the issue. Merge-request: 1480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Fix memory leak when deleteLater is triggered via the main menu bar.Morten Sorvig2009-09-111-0/+2
| | | | | | | | | | | | | | | | | | | | The deleteLater was beeing created with loopLevel of 1, causing it to be defferd until QApplication::exec() returned. Add a QScopedLoopLevelCounter to increase the loopLevel while triggering the action. RevBy: Brad
| * Remove yet another forgotten debug message.Morten Sorvig2009-09-111-1/+0
| |
| * Pick a suitable default architecture for qmake-based applications.Morten Sorvig2009-09-111-0/+16
| | | | | | | | | | | | | | | | | | If the Qt package contains one of x86 and x86_64, pick that one. If it contains both then use the compiler default. Make a similiar decision for PowerPC-based systems. Note that this logic assumes that Qt has been configured with an architecture that is usable on the system. Reviewed-by: Marius Storm-Olsen
| * Run on 10.3.Morten Sorvig2009-09-111-1/+1
| | | | | | | | | | _HIViewScrollRectWithOptions needs to be declared as a weak-linked symbol in order to make static linking work.
| * Run on 10.3 Panther.Morten Sorvig2009-09-111-1/+4
| | | | | | | | HIViewSetNeedsDisplayInRect was added in 10.4.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-117-13/+82
|\ \ | |/
| * restoring a minimized window on Windows CE didn't workJoerg Bornemann2009-09-102-5/+12
| | | | | | | | | | | | | | | | | | | | After restoring a minimized window we only saw the window decoration. All content was missing. That's because we don't get a WM_SIZE message for restoring the window. We must react on WM_ACTIVATE in this case. This fixes the issue for Windows mobile too. Task-number: 260702 Reviewed-by: thartman
| * QHttpNetworkConnection autotest: include zlib dirPeter Hartmann2009-09-101-0/+1
| | | | | | | | | | | | test was not building Reviewed-by: Trust Me
| * Only reset the backend pointer after we're done with itJoão Abecasis2009-09-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Since 925912ebf552417306a5bd20fd986afda6a582be QNetworkReplyImplPrivate no longer holds its own pointer to the network cache and relies on the backend to get it. Since the cache is used in our call to finished, we must reset the backend only after that. This fixes a crash I was seeing in Arora... Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * tst_qinfo: Be more verbose in case of failuresMarkus Goetz2009-09-101-0/+6
| |
| * Make opengl fragment program generator output license header.Jason McDonald2009-09-102-4/+57
| | | | | | | | | | | | | | Stops the license checker failing each time the file is re-generated. Also added "_P" to the generated header guard, as it's a private header. Reviewed-by: Gunnar Sletta
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-108-22/+70
|\ \ | |/
| * Fixes autotest for MS SQL ServerBill King2009-09-101-1/+4
| | | | | | | | Merging fix back into 4.5 tree
| * Fixes determination of end of odbc string on deficient driverBill King2009-09-102-6/+47
| | | | | | | | | | | | | | Ported this fix backwards from 4.6 to 4.5 Adds some cleanups (using QVarLengthArray), and reverting to the initial and correct calculation (when the driver doesn't deem fit to return SQL_NO_DATA).
| * Doc: Note that Netscape plugins are only available on desktop platforms.David Boddie2009-09-091-3/+7
| | | | | | | | | | Reviewed-by: Takumi Asaki Also-applied-as: 3f257dcf8c8ca812d60d4a6a4c2cd2da96bba526
| * Autotest: fix the test for NUL in SAN. It was missing "www".Thiago Macieira2009-09-091-1/+1
| | | | | | | | Reviewed-by: Marius Bugge Monsen
| * tst_qhostinfo: Backported some 4.6 fixes, increased timeoutMarkus Goetz2009-09-091-7/+4
| |
| * Avoid garbled output on Windows for non-ascii-compatible textEskil Abrahamsen Blomfeldt2009-09-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | In the Windows print engine, we try to send a text item as a raw string of characters to the printer driver if this is possible. This is to facilitate using PDF-printers as much as possible, allowing them to save the text in the document so for searching etc. We can only safely do this if all the characters in the string are ASCII-compatible, i.e. in the 7 bit range, since this is the only part of the set which is guaranteed to be compatible across code pages. Task-number: 180655 Reviewed-by: Trond
| * QHttpNetworkConnection autotest: include zlib dirPeter Hartmann2009-09-091-0/+1
| | | | | | | | | | | | test was not building Reviewed-by: Trust Me
| * Make configure show the correct license namefor tech previews.Jason McDonald2009-09-091-0/+2
| | | | | | | | | | Task-number: 261031 Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-098084-32294/+32607
|\ \ | |/
| * network-settings.h: Check for DNS setup only when neededMarkus Goetz2009-09-081-0/+2
| |
| * Fix moc test after licence change.Olivier Goffart2009-09-081-1/+1
| | | | | | | | os9-newlines.h must not contains any linebreak
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-082-7/+33
| |\
| | * Fixed bug in drawImage() when fall-back code path is used.Samuel Rødal2009-09-082-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | We need to floor instead of round to prevent rectangles that are on the edge from being shifted one pixel down / right. Task-number: 258776 Reviewed-by: Kim
| * | Update license headers again.Jason McDonald2009-09-088050-32121/+32169
| |/ | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-09-0834-166/+403
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-088-48/+44
|\ \ | |/
| * Tests: Do not execute network tests at all if DNS setup is broken.Markus Goetz2009-09-081-0/+14
| | | | | | | | Reviewed-by: Jesper
| * Doc: keypad navigation is supported on Windows CEJoerg Bornemann2009-09-081-2/+10
| | | | | | | | Reviewed-by: thartman
| * Fixed compile on Solaris.Rohan McGovern2009-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The `test' builtin in Solaris' /bin/sh does not understand `-e', use `-f' instead. Fixes: configure: test: argument expected Note, using the `-nokia-developer' configure option hides this breakage. Reviewed-by: Rhys Weatherley
| * Remove license header, which cannot be parsed by Sun assembler.Rohan McGovern2009-09-051-40/+0
| | | | | | | | | | Commit 2e0d78836becf24c7f27c982316cf1b4492f27aa fixed this for i386 but omitted the fix for x86_64.
| * Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | On 10.5 and below the pixmap data bytes happened to be initialized by malloc, on 10.6 this is no longer the case. Revby: Gunnar Sletta <gunnar@trolltech.com> Similar to 28f94e1ef94f.
| * Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-09-041-0/+1
| | | | | | | | | | | | | | We need to clear the QPixmap before the image is drawn using the CGContextDrawImage(). Reviewed-by: Norwegian Rock Cat
| * Fix a regression with QListView::setRowHidden() when a root index is setAndy Shaw2009-09-042-4/+16
| | | | | | | | | | | | | | | | | | When setRowHidden() was called after a root index was set then it would not actually hide the row, if a root index is not set then it worked fine. Task-number: 260879 Reviewed-by: Jan-Arve
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-0412-4/+456
|\ \ | |/
| * Fixed clipping of native style elements when raster is used on macGunnar Sletta2009-09-041-2/+6
| | | | | | | | Reviewed-by: Trond
| * Add license headers to .l files.Jason McDonald2009-09-042-0/+82
| | | | | | | | Reviewed-by: Trust Me
| * Add license headers to python codeJason McDonald2009-09-049-2/+368
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-0470-35/+1544
|\ \ | |/
| * Remove license header as Solaris X86 assembler can't digest comments.Jason McDonald2009-09-041-40/+0
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-041-0/+6
| |\
| | * restoring a minimized window on Windows CE didn't workJoerg Bornemann2009-09-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | After restoring a minimized window we only saw the window decoration. All content was missing. That's because we don't get a WM_SIZE message for restoring the window. We must react on WM_ACTIVATE in this case. Task-number: 260702 Reviewed-by: thartman
| * | Pedantic fixes for license headers.Jason McDonald2009-09-0428-27/+69
| |/ | | | | | | Reviewed-by: Trust Me
| * Fix compilation with assemblers that don't use ; for commentThiago Macieira2009-09-036-240/+240
| | | | | | | | | | | | | | | | | | Sun Solaris assembler uses ! for comments. IBM AIX assembler uses #. The MIPS and Alpha files are probably broken, but we don't have any non-gcc platforms on those systems anymore. Reviewed-by: Bradley T. Hughes
| * unneeded Q_OS_WINCE checks removedJoerg Bornemann2009-09-031-5/+1
| | | | | | | | | | | | There's a big outer ifdef and we don't need these inner checks. Reviewed-by: thartman
| * Fixed autotest failure in qwindowsurface on X11 with Oxygen style.Samuel Rødal2009-09-031-0/+6
| | | | | | | | | | | | | | | | Oxygen draws a fancy background gradient etc so it's not suitable for this kind of pixel testing. Since we're testing the window surface and not the style just use the simple QWindowsStyle here. Reviewed-by: Gunnar Sletta
| * Add missing license headers to assembly filesJason McDonald2009-09-0312-0/+480
| | | | | | | | | | | | | | | | There is apparently some risk that assemblers on obscure platforms may not understand assembler comments. If that turns out to be the case we'll have to remove the headers for any such platforms. Acked-by: Bradley T. Hughes