summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add a state() function to QScriptEngineDebugger for determining whether the debuJoel Nordell2009-06-174-0/+36
| | | | | | | gger is suspended or not Merge-request: 555 Reviewed-by: Kent Hansen <khansen@trolltech.com>
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtFriedemann Kleint2009-06-172-1/+24
|\
| * Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-172-1/+24
| | | | | | | | | | | | | | | | | | The problem is that it was relying on button->isVisible whereas it should rely on isHidden. isVisible returns false initially when the whole widget is not yet shown. I also added an autotest for it. Task-number: 256331
* | Fixed an oversight in Qt Designer that prevents one from designing empty tab ↵J-P Nurmi2009-06-171-5/+7
| | | | | | | | | | | | widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fixed an oversight in Qt Designer that prevents one from designing empty ↵J-P Nurmi2009-06-171-4/+7
|/ | | | | | stacked widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-1712-52/+88
| | | | | | | | | | | | | | | | This change moves the w, h, d variables to QPixmapData and introduces is_null to keep track of nullness. This is possible only because QPixmapData is internal API; otherwise we'd have to be smarter. The optimization makes the QPixmap::width() function take 7 instructions, down from 34 before. For the calculator demo in the declarative ui branch this reduces a block of 750000 instructions (out of 30000000) to around 100000-150000 instructions. Tested on Windows, Linux, Mac. Raster, X11 and OpenGL paint engines. Have not tested the DirectFB engine. Reviewed-by: Trond
* perform all property assignments of initial state that's nestedKent Hansen2009-06-172-13/+21
| | | | | | If the machine's initial state is nested, a set of states will be entered, and we need to do the property assignments of all of them.
* QWebPage: Don't call supportsSsl()Markus Goetz2009-06-171-2/+6
| | | | | | | This stops QWebPage from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: Simon Hausmann
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtFriedemann Kleint2009-06-178-8/+46
|\
| * bring back QAbstractTransition::triggered() signalKent Hansen2009-06-175-0/+25
| | | | | | | | | | | | It's been requested by several users. Since we have QAbstractState::{entered,exited}() signals, we should have this one as well.
| * Prevented infinite recursion in GL graphics system.Samuel Rødal2009-06-173-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | If creating a QGLWidget triggers the creation of a QPixmap then we might end up in an infinite recursion due to QPixmap trying to access qt_gl_share_widget(). This can happen via setWindowIcon for example. Adding an initializing flag to QGLGlobalShareWidget and preventing QGLFramebufferObject::hasOpenGLFramebufferObjects() and ::hasOpenGLFramebufferBlit() from creating a QGLWidget every time they are called with no active GL context. Reviewed-by: Trond
| * add tests for QAbstractState::{entered,exited}() signalsKent Hansen2009-06-171-0/+9
| |
* | Commented out code that breaks MinGW.Friedemann Kleint2009-06-171-1/+16
| | | | | | | | Reviewed-by: Simon Hausmann <shausman@trolltech.com>
* | Fixed MinGW compilation.Friedemann Kleint2009-06-171-1/+1
|/ | | | Reviewed-by: Simon Hausmann <shausman@trolltech.com>
* prevent subclasses from emitting entered() and exited()Kent Hansen2009-06-171-0/+3
| | | | The state machine decides when these signals are emitted.
* doc: Fixed several qdoc warnings.Martin Smith2009-06-173-36/+45
| | | | | | | | All the qdoc errors are fixed in QStringBuilder, but because the class is a template class and uses strange templates, qdoc gets very confused, and the resulting documentation for QStringBuilder is not complete and accurate. To fix this correctly will require changes to the qdoc program.
* Fix QGraphicsItem::ItemHasNoContents rendering of children.Andreas Aardal Hanssen2009-06-172-2/+30
| | | | | | | The ItemHasNoContents flag was preventing items that clip their children from rendering their children at all. Fixed now. Reviewed-by: bnilsen
* QNAM: Use QTcpSocket for HTTP if no encryption was requestedMarkus Goetz2009-06-171-9/+26
| | | | | | | This stops QNetworkAccessManager from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: mariusSO
* Update license headers in files that are new in 4.6.Jason McDonald2009-06-17249-497/+497
| | | | Reviewed-by: Trust Me
* fix typoOswald Buddenhagen2009-06-161-1/+1
|
* Fixed a bottleneck in itemviews that would ask for an update outsideThierry Bastian2009-06-161-2/+8
| | | | | | | | | | of the boundaries of the viewport. Now we catch this and don't call update. This was a performance regression against 4.4. Task-number: 256183 Reviewed-by: alexis
* Removed trailing whitespace.Bruno Abinader2009-06-165-116/+113
| | | | | | | Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
* Fixed small typo on the animation framework documentation.Bruno Abinader2009-06-161-5/+6
| | | | | | | | | | QAbstractClass is in fact QAbstractTransition, also added proper link to the addAnimation() method from that class. Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-1656-197/+226
|\
| * Store promoted Widgets correctly in the ScratchPad.Friedemann Kleint2009-06-161-0/+10
| | | | | | | | | | | | | | Add code to make promoted widget entries to widget DB to widget box form builder. Task-number: 233683
| * Prevent uic3 from clobbering the QLabel3::wordWrap property.Friedemann Kleint2009-06-161-7/+10
| | | | | | | | | | | | Basically make use of customer patch, do not try to use the value obtained from the alignment if property is present. Task-number: 128859
| * Made uic generate QLayout::setContentsMargin instead of setMargin.Friedemann Kleint2009-06-1654-190/+206
| | | | | | | | | | With the exception of layout functions, which is too weird. Task-number: 255846
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-167169-15545/+144839
|\ \ | |/ |/|
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-06-164-2/+35
| |\
| | * Backported WebKit SVG revisions (r43590, r43795) from the trunkSimon Hausmann2009-06-164-2/+35
| | | | | | | | | | | | Reviewed-by: Ariya
| * | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-1617-30/+30
| |/ | | | | | | Reviewed-by: Trust Me
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-167172-14473/+14511
| | | | | | | | Reviewed-by: Trust Me
| * Make the codeeditor example compile on Windows.Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | | | Local includes should use the double-quote form of #include rather than the angle-bracket form. Reviewed-by: Trust Me
| * Improved styling of expander arrows with Gtk+Jens Bache-Wiig2009-06-161-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation was based on the GtkExpander widget. However we do not have such a widget and the primary use case is for expanders inside item views. Hence it makes sense to base it on gtktreeview instead. As I can not reproduce the crash with any recent versions of cleanice I will remove the workaround as well. omment and edit as applicable ]---| Task-number: 256146 Reviewed-by: Thorbjørn
| * disable stdout buffering alltogetherOswald Buddenhagen2009-06-161-6/+3
| | | | | | | | | | | | | | | | having system-dependent bahavior is Not Nice (TM), and given that we do only printf()s of whole lines anyway, this should have no performance impact whatsoever. Reviewed-by: mariusSO
| * Prevented QCompleter popup from appearing briefly on Windows.jasplin2009-06-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that the fix 7bf4512659113f8cc78e72f1c84158ce4f70a526 caused the QCompleter popup from appearing for a split second on Windows. This is because the popup is shown as a toplevel window on this platform. On other platforms than Mac and Windows it doesn't seem to matter, but be on the safe side, the fix is modified to apply for Mac only. Reviewed-by: Daniel Molkentin Task-number: 255374
| * Fixes to get some MS Sql Server tests running again + new db definitions.Bill King2009-06-162-1/+10
| |
| * Fixes crash of qmake on Windows Vista Business x64 (and undefinedRohan McGovern2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | behavior on all versions of Windows). setvbuf handles its arguments differently on Unix and Windows. Windows uses the size parameter when the given buffer is NULL, which appears to violate C89/C99. Giving a size parameter of 0 with a NULL buffer caused qmake to crash on Windows Vista Business x64. Windows also can't set line buffering with setvbuf _at all_ according to the MSDN documentation, so don't bother calling it on Windows.
| * Add Qt 4.4.0 linux-gcc-ia32 testdata to bic test and make the bic testRohan McGovern2009-06-1614-33/+129891
| | | | | | | | | | | | | | | | | | code more maintainable. Stop hardcoding the list of versions to test. Note that this test currenty FAILS because QGraphicsProxyWidget vtable size has changed from 4.4 -> 4.5.
| * Force line buffering for stdout so it stays in sync better with stderr ↵audiofanatic2009-06-151-0/+7
| | | | | | | | | | | | | | | | (which is unbuffered) Task-number: 254786 Merge-request: 610 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * ignore some moreOswald Buddenhagen2009-06-151-0/+2
| |
| * no point in ProFile being a QObjectOswald Buddenhagen2009-06-151-4/+1
| |
| * remove unused includesOswald Buddenhagen2009-06-152-2/+0
| |
| * remove pointless prisOswald Buddenhagen2009-06-151-2/+0
| |
| * QFile: Doc was pointing to deprecated QIODevice::isSequentialAccess()Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | Changed to QIODevice::isSequential() Reviewed-by: TrustMe
| * Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-152-1/+39
| | | | | | | | | | | | | | | | | | Because less-than instead of less-or-equal-than was used, the last line of a PEM encoding was not built when the raw length was multiple of 64. Task-number: 256066 Reviewed-by: mariusSO
| * New binary for configure.exeMarius Storm-Olsen2009-06-151-0/+0
| | | | | | | | Reviewed-by: trustme
| * make qm target work when the freshly built Qt is not in the libraryOswald Buddenhagen2009-06-151-2/+11
| | | | | | | | | | | | | | | | | | search path unlike moc and uic, lrelease is not statically built, so when building without RPATH, we need to ensure that our libraries are found first. Reviewed-by: mariusSO
| * Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.Morten Sørvig2009-06-154-4/+4
| | | | | | | | Reviewed-by: Richard Moe Gustavsen
| * make qscript unit tests not crash when test files are not foundKent Hansen2009-06-152-16/+18
| |
generated by cgit v0.12 at 2024-11-12 05:43:16 (GMT)