summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile fix until configure.exe is rebuilt for WindowsThiago Macieira2009-10-291-1/+2
|
* Merge branch '4.5' into 4.6Thiago Macieira2009-10-291-0/+2
|\
| * Plug some autorelease pool leaks.Norwegian Rock Cat2009-10-291-0/+2
| | | | | | | | | | | | | | | | Calling QWidget::setCursor() outside of the event loop causes a memory leak in Cocoa. Adding an autorelease pool plugs it. Merge-request: 1791 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| * Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-10-271-0/+1
| | | | | | | | | | | | Cherry-picked from d8a2e52e Merge-request: 419 Reviewed-by: Olivier
* | Autotest: add a few more tests for Unicode (IDN) supportThiago Macieira2009-10-291-2/+5
| |
* | Autotest: add one test that was in the previous implementation but missing hereThiago Macieira2009-10-291-0/+1
| |
* | Autotest: use example.org and example.netThiago Macieira2009-10-291-12/+12
| | | | | | | | | | | | No need to publicise real sites and email addresses. Also, don't use 8-bit data. C escape sequences are ok.
* | Import a new implementation of fromUserInput.Thiago Macieira2009-10-292-0/+117
| | | | | | | | | | | | Imported from http://github.com/icefox/guessurlfromstring Licensed under the 3-clause BSD license by the copyright holder.
* | Remove the fromUserInput implementation and tests.Thiago Macieira2009-10-292-128/+46
| | | | | | | | Reviewed-by: Trust Me
* | Also change the configure.exe to ensure that the necessary new configsThiago Macieira2009-10-291-1/+23
| | | | | | | | | | | | are generated Reviewed-By: Daniel Molkentin
* | Add the Qt Evaluation message to the hidden libQtCore.so boilerplate.Thiago Macieira2009-10-291-0/+8
| | | | | | | | Reviewed-By: Trust Me
* | Part 2 of the Evaluation notice feature, now for QtGui.Thiago Macieira2009-10-293-8/+32
| | | | | | | | Reviewed-by: Daniel Molkentin
* | Readd the Qt Evaluation timebomb, step 1.Thiago Macieira2009-10-295-1/+585
| | | | | | | | | | | | This is the QtCore part of the timebomb. Reviewed-by: Daniel Molkentin
* | Cache a state's parent stateKent Hansen2009-10-293-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractState::parentState() is called heavily by the state machine algorithm. The parent state is obtained by qobject_cast'ing QObject::parent(). qobject_cast() is expensive. This commit introduces caching of the result in order to improve performance. We expect that the cache won't be invalidated much since the parent-child relationship of states usually doesn't change after the state machine is started. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | doc: Remove \internal tag from QStateMachine::configuration()Kent Hansen2009-10-291-2/+0
| | | | | | | | | | | | | | | | This function is useful for debugging, if nothing else, and has been requested by users. We also refer to it in one of our blog posts, so there's little point in trying to hide it any longer. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Make QStateMachine event posting functions thread-safeKent Hansen2009-10-293-17/+131
| | | | | | | | | | | | | | | | By popular demand on the Qt Labs blog. This makes it possible to readily use QStateMachine with e.g. worker threads that post events to the machine. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Test that we gracefully handle event posting after the state machine is stoppedKent Hansen2009-10-291-0/+17
| | | | | | | | | | The internal slot _q_process() should never be called if the machine is not in the Running state.
* | Cache QState's child statesKent Hansen2009-10-292-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the same type of optimization as that done for transitions in commit 5d8dcd57cd13fdd9c8643fa3bdda9f197a4351ff. The idea is to avoid calling qobject_cast() because it's very expensive. Obtaining child states needs to be as fast as possible because it's in the critical path of the state machine algorithm; it's called by a ton of internal functions, like isCompound(), isAtomic(), isInFinalState(). It's also called heavily for parallel state groups. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | QStateMachine::event() should call QState::event()Kent Hansen2009-10-291-1/+1
| | | | | | | | | | | | Since QStateMachine inherits QState now. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | doc typoWarwick Allison2009-10-291-1/+1
| |
* | Change all valid Task-Tracker references to bugreports.qt.nokia.com reference.Warwick Allison2009-10-294-4/+4
| |
* | Remove shader/program binary support for nowRhys Weatherley2009-10-282-222/+0
| | | | | | | | | | | | | | | | | | | | After API review discussions, it was decided to remove shader binary support until we have a better handle on what we need. Applications can directly load shader binaries on the shaderId() using glShaderBinary() directly so they aren't prevented from using the feature. Reviewed-by: trustme
* | Remove QVGEGLWindowSurfaceQImage from QtOpenVGRhys Weatherley2009-10-283-80/+2
| | | | | | | | | | | | | | | | Rendering into a QImage as a window backing store isn't very efficient and isn't needed by any of our current platforms. If a specific graphics system needs it in the future, it can implement it directly. Reviewed-by: trustme
* | make magic comment parsing stricterOswald Buddenhagen2009-10-281-9/+9
| | | | | | | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc.
* | QSslError: Actually make strings show up in the ts fileMarkus Goetz2009-10-281-29/+28
| | | | | | | | | | | | | | | | | | I suspect because of missing quotation marks those strings were not showing up. Also, wrapping QT_TRANSLATE_NOOP inside a tr() call makes no sense. Also changed the class from QObject to QSslSocket. Task-number: QTBUG-5059 Reviewed-by: ossi
* | QNativeSocketEngine: Actually use translationsMarkus Goetz2009-10-281-26/+26
| | | | | | | | | | Task-number: QTBUG-4984 Reviewed-by: Thiago
* | Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixedJocelyn Turcotte2009-10-281-23/+0
| | | | | | | | | | | | upstream. Reviewed-by: TrustMe
* | Greatly improve the performance of obtaining a state's transitionsKent Hansen2009-10-282-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transitions are children of their source state. We use QObject::children() and qobject_cast() each child to a QAbstractTransition to see if it is indeed a transition. However, calling qobject_cast() is very expensive. This commit introduces a cached list of transitions. The list is invalidated after a child object has been added or removed. In the typical case we expect the object hierarchy to remain fairly constant once the state machine has been started (states, child states and transitions are usually "static"), in other words the cached list is not likely to be invalidated much. Obtaining a state's transitions needs to be as fast as possible because it's in the critical path of the state machine algorithm. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Make Qt on QNX compile againHarald Fernengel2009-10-282-3/+3
| | | | | | | | Fix a typo, update the tmp path to match current qws behavior.
* | Say hello to QScriptProgram :-)Kent Hansen2009-10-2810-59/+763
| | | | | | | | | | | | | | | | | | | | | | QScriptProgram encapsulates a Qt Script program (AKA a script). It retains the compiled representation of the script, so that repeated evaluation of the same script becomes faster. An overload of QScriptEngine::evaluate() that takes a QScriptProgram has been added. Reviewed-by: Olivier Goffart
* | Fix namespace buildRichard Moe Gustavsen2009-10-282-0/+6
| | | | | | | | | | | | Looks like a couple of files missed the namespace macro... Rev-By: gunnar
* | Fix namespace build.Richard Moe Gustavsen2009-10-281-3/+2
| | | | | | | | | | | | | | | | | | At least Qt fails building with a namespace on Mac without this change. What happends is that inserting a namespace before the includes, will add the namespace twize if the included files also inserts the namespace. Rev-By: Alexis
* | qdoc: Update QGraphicsTransform docs after changes to QGraphicsRotationRhys Weatherley2009-10-281-0/+3
| | | | | | | | Reviewed-by: Michael Brasser
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-2850-341/+20957
|\ \
| * | Add 800x480 to the qvfb configuration dialogRhys Weatherley2009-10-282-1/+11
| | | | | | | | | | | | | | | | | | | | | 800x480 is an increasingly common screen size on embedded devices, and specifying it via Custom sizes is annoying. Reviewed-by: Sarah Smith
| * | Doc: Fixed qdoc warning.David Boddie2009-10-271-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Remove unused file.David Boddie2009-10-271-149/+0
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Guard shadow builds against stale qconfig.cppDonald Carr2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qconfig.cpp is generated immediately after accepting the licensing agreement, and contains all the fixed paths qt uses. If this file is present in a source dir used by shadow builds, this qconfig.cpp will take precedence over the shadow builds qconfig.cpp and hence impose its paths throughout the shadow built Qt. This change adds qconfig.cpp to the list of generated files to guard against existing in the source directory when performing a shadow build. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Fix for Gtk+ toolbuttons and sliders.Robert Griebl2009-10-273-7/+34
| | | | | | | | | | | | | | | | | | Maemo5 looks very weird without these patches. Reviewed-By: jbache
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6axis2009-10-2731-51/+20727
| |\ \
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-2789-634/+1638
| | |\ \
| | * | | Fixed select softkey for comboboxes (QTBUG-4702).Janne Anttila2009-10-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The created keyed actions are passed to wrong widget if this pointer is passed insted of itemView. Also create softkey actions in setItemView method instead of constructor in order that custom items views are also working correctly. Task-number:: QTBUG-4702 AutoTest: All QComboBox tests passed Reviewed-by: Jason Barron
| | * | | Removed the need for extra Symbian traps after QApp construction.axis2009-10-263-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by putting back the old trap handler after the S60 framework construction has finished. Task: QTBUG-4960 AutoTest: Included and passed RevBy: Shane Kearns
| | * | | Fix QCompleter autotest for case insensitive filesystemsShane Kearns2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directory completion test case was constructing a case insensitive name completer, but doing a case sensitive string comparison of the test result. After this change, it uses the same case sensitivity the QCompleter was constructed with to perform the comparison - which varies according to the test case. Reviewed-by: axis
| | * | | Make network self test fail instead of crashing in case of DNS errorShane Kearns2009-10-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Liang QI Reviewed-by: Aleksandar Sasha Babic
| | * | | Fixed a crash in the QApplication autotest.axis2009-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no focusWidget at the time of the event delivery, we must ensure that we don't dereference a null pointer. RevBy: Jason Barron RevBy: Liang Qi
| | * | | Emulator IAP fix for SymbianJanne Koskinen2009-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't display multiple useless IAP dialogs in the emulator environment. If you need specific IAP then you need to revert this commit. Reviewed-by: Aleksandar Babic
| | * | | Remove compilation warning from QtGuiSami Merilä2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style causes a compilation warning due to using incorrect parameter when adjusting rect size in adjusted() call. The problematic line is using twice same parameter and thus leaves one pre-set parameter unused, which causes a compilation warning. Fixed by using the correct parameter. Task-number: N/A Reviewed-by: Trust Me
| | * | | Small updates to WINSCW DEF filesIain2009-10-237-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the originals may have had some extra exports from udeb in them Reviewed-by: TrustMe
| | * | | *Experimental* WINSCW DEF files for Qt, except WebKitIain2009-10-2311-0/+20308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: No autotest exports, no EGL exports from QtGui Reviewed-by: Jason Barron