summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't crash when null-pointer is passed to qScriptValueFromValue()Kent Hansen2010-10-292-4/+8
| | | | | | | | | | | | qScriptValueFromValue_helper() (or rather, QScriptEnginePrivate::create()) will fall back to wrapping the value using newVariant(), so there is no reason for the QVariant specialization to check the return value. (In particular, if the return value was invalid, that's _because_ the engine was null, so we should definitely not call a function on the engine.) Task-number: QTBUG-14842 Reviewed-by: Jedrzej Nowacki
* Simplify object lifetime management when moving objects to a QThreadBradley T. Hughes2010-10-295-3/+95
| | | | | | | | | | | | | | | | | | | | | | The documentation for Qt::AutoConnection states is a signal is emitted from the same thread as the receiving object, the connection should behave as Qt::DirectConnection. The actual behavior prior to this commit was different from the documentation; if the signal was emitted in a thread different from the sender's thread, then we would queue (which is now corrected). By making the behavior match the documentation, it is now possible to connect QThread's finished() signal to an object's deleteLater() slot and the slot will execute when finished() is emitted (previously it was queued). QObject::deleteLater() uses a posted QEvent::DeferredDelete event to trigger deletion of the object. In QThread, after emitting the finished() signal, we now send all pending DeferredDelete events to ensure that all pending deletions happen. We have precedence for this behavior, QCoreApplication::exec() does the same thing after emitting the aboutToQuit() signal. Reviewed-by: joao Reviewed-by: olivier
* Merge remote branch 'scm/qt/master'Tor Arne Vestbø2010-10-2823-39/+192
|\ | | | | | | | | Conflicts: mkspecs/symbian-gcce/qmake.conf
| * Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-2712-16/+79
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix bug in QML debug client installation Doc clarification for Loader. Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget Create dummy window surface if if _q_DummyWindowSurface property is set Remove widget subtree from backing store tracker when reparented Suppress call to controlVisibilityChanged for null control pointer Set the location of the closing brace. Fix patch_capabilities.pl script for explicit set of capabilities Fix empty mifconv TARGETFILE in some edge cases.
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2712-16/+79
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-272-2/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix bug in QML debug client installation Doc clarification for Loader.
| | | | * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Allow QML debug clients to be installed between the connection being established and the hello message being received.
| | | | * Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-262-4/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Set the location of the closing brace.
| | | | * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Christian Kamm
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-268-10/+72
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget Create dummy window surface if if _q_DummyWindowSurface property is set Remove widget subtree from backing store tracker when reparented Suppress call to controlVisibilityChanged for null control pointer Fix patch_capabilities.pl script for explicit set of capabilities Fix empty mifconv TARGETFILE in some edge cases.
| | | | * | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a window surface being created if Phonon::VideoWidget::setFullScreen(true) is called. Since Qt does not ever render any content to the native window in which video is displayed, creation of a surface for that window would consume memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron
| | | | * | Create dummy window surface if if _q_DummyWindowSurface property is setGareth Stockwell2010-10-261-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: MOBILITY-1315 Reviewed-by: Jason Barron Reviewed-by: bnilsen
| | | | * | Remove widget subtree from backing store tracker when reparentedGareth Stockwell2010-10-263-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a native widget is reparented such that the value of maybeBackingStore() changes, it and all of its native descendents must be removed from the old QWidgetBackingStoreTracker. If this is not done, the backing store may not be deleted when the top-level widget is hidden, thereby consuming memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron Reviewed-by: bnilsen
| | | | * | Suppress call to controlVisibilityChanged for null control pointerGareth Stockwell2010-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point, old_winid may be null. Passing a null pointer to controlVisibilityChanged is actually a no-op, due to the 'QWidgetPrivate::mapper->contains(control)' check, but suppressing the function call altogether clarifies the intent of the code slightly. Reviewed-by: Jason Barron
| | | | * | Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Elftran command never got executed when explicit set of capabilities was defined. No warning or error was printed either, making it rather confusing for user. Task-number: QTBUG-14730 Reviewed-by: Janne Koskinen
| | | | * | Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-262-2/+7
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add ICON for Qt gui application projects that do not explicitly want to suppress it in symbianpkgrules.pri. This logic should match the logic used for setting RSS_RULES.icon_file and thus avoid empty TARGETFILE in bld.inf mifconv extension. Task-number: QT-4193 Reviewed-by: Janne Koskinen
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-277-4/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix QEventLoop::X11ExcludeTimers with Glib event loop Fix QAbstractProxyModel::mimeData to use list of mapped indexes don't build qelfparser on non-elf platforms fix warnings fix build with sse2 and without ssse3
| | * | | | fix QEventLoop::X11ExcludeTimers with Glib event loopLuboš Luňák2010-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GSource prepare or check functions return TRUE, Glib does not necessary call the dispatch function immediatelly (probably depends on the ordering of processing events). This means that timerSourceDispatch() may get called from different call of QEventDispatcherGlib::processEvents() than its accompanying timerSourcePrepareHelper() or timerSourceCheckHelper(). This is a problem if a timer becomes pending during a normal processEvents() call but will only be executed during a call to processEvents() with QEventLoop::X11ExcludeTimers. The attached patch fixes this problem by rescheduling the timer for another pass. As for a testcase, this happens when making LibreOffice's KDE integration use Qt event loop, requires setting the useEventLoop property on the QClipboard object, so I'm afraid I don't have anything simple. But fact that Glib can keep an event pending for a little moment is rather obvious from its sources or can be triggered from any Qt application, and I hope the rest is an obvious consequence. Merge-request: 2492 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * | | | Fix QAbstractProxyModel::mimeData to use list of mapped indexesPavel Lebedev2010-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of original in call to source model. Merge-request: 876 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * | | | don't build qelfparser on non-elf platformsKonstantin Ritt2010-10-272-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 891 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * | | | fix warningsKonstantin Ritt2010-10-272-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 891 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * | | | fix build with sse2 and without ssse3Konstantin Ritt2010-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 892 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-273-15/+93
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed a bug in the elf2e32_qtwrapper script. Fix some build issues for building Qt for Symbian on Mac OS X.
| | * | | | Fixed a bug in the elf2e32_qtwrapper script.axis2010-10-271-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It did not handle missing symbols in all cases, most notably when elf2e32 decides to omit it from the produced def file. This required us to start reading the original def file as well, to find out what the original symbols was. Task: QTBUG-11839 RevBy: Thomas Zander
| | * | | | Fix some build issues for building Qt for Symbian on Mac OS X.Liang Qi2010-10-272-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-271-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make sure the correct attribute arrays are enabled in GL's glyph cache
| | * | | Make sure the correct attribute arrays are enabled in GL's glyph cacheEskil Abrahamsen Blomfeldt2010-10-271-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scene graph does not update the context's attribute array settings, so depending on the order of events, the calls to enable the vertex array etc. might be ignored. Reviewed-by: Kim
* | | | samegame: white spacehjk2010-10-281-90/+108
| | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
* | | | Move list of trusted benchmarks out of QA dungeon and into QtTor Arne Vestbø2010-10-279-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To run the list of trusted benchmark do 'make check-trusted' in either the root benchmarks directory or for any of the immediate sub-targets. Normal 'make check' environment variables apply, such as TESTRUNNER and TESTARGS. Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | | | Don't put Objective-C sources in SOURCESTor Arne Vestbø2010-10-271-1/+2
| | | | | | | | | | | | | | | | Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
* | | | mkspecs: Emit warning when including g++.conf directlyTor Arne Vestbø2010-10-2714-37/+48
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people with their own mkspec who would still include g++.conf directly. We now print a warning if this situation is detected, and explain to the user how they can fix their mkspec. For convenience we redirect g++.conf to g++-unix.conf so that people's mkspecs will still work. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-268-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Doc : Fixing typo.
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-268-8/+8
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-268-8/+8
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc : Fixing typo.
| | | * Doc : Fixing typo.Sergio Ahumada2010-10-268-8/+8
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-261-22/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QDataStream: speedup steaming of QString by avoiding an unesessary copy.
| * | | | QDataStream: speedup steaming of QString by avoiding an unesessary copy.Olivier Goffart2010-10-261-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The operator<< now does the same way as the operator>> Reviewed-by: Shane Kearns
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-2622-277/+316
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support to build Qt for Symbian on Mac OS X with gcce compiler. Fixed library and header definitions for Symbian builds on Linux. Got rid of some "duplicate library" warnings. Added wrapper for the elf2e32_qtwrapper script. Changed various qmake constructs to support Windows. Fixed various quotation problems when porting to Windows. Fixed some preprocessor parameters for Mac support. Removed the need for S60main.rsc resource file in Symbian. Added detection of bat files to the qtPrepareTool function. Renamed the symbian/linux-* mkspecs to symbian-*. Fixed library ordering when linking to qtmain.
| * \ \ \ \ Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-2622-277/+316
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-262-83/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig
| | * | | | Fixed library and header definitions for Symbian builds on Linux.axis2010-10-212-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Gareth Stockwell ...who was right to point out that the is_using_gnupoc scheme is terrible, so now we have a task for getting rid of that, QTBUG-14361.
| | * | | | Got rid of some "duplicate library" warnings.axis2010-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | Added wrapper for the elf2e32_qtwrapper script.axis2010-10-213-145/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to call the script on Windows. RevBy: Trust me
| | * | | | Changed various qmake constructs to support Windows.axis2010-10-213-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander
| | * | | | Fixed various quotation problems when porting to Windows.axis2010-10-212-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| | * | | | Fixed some preprocessor parameters for Mac support.axis2010-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Liang Qi
| | * | | | Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-217-57/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt upgrade was failing since the s60main.rsc is being locked by S60 application framework. And when installer detects that old version of Qt has already been installed it first tries to uninstall the old one and then install the new one. The uninstallion failed since the file was locked by the running Qt application. It should be noted that this patch fixes the Qt upgradibility only for Qt versions where patch is included. I.e. the versions before 4.7.2 need a different mechanism to be upgradable. This different mechanism is based on partial upgrade SIS packages as described in QT-4052. Task-number: QT-3471 Reviewed-by: Axis
| | * | | | Added detection of bat files to the qtPrepareTool function.axis2010-10-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all tools end with .exe. Some also end in .bat. RevBy: Oswald Buddenhagen
| | * | | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-2112-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander
generated by cgit v0.12 at 2025-01-08 05:19:56 (GMT)