summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-162-10/+22
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: diagramscene example: fix leak and crashes.
| * diagramscene example: fix leak and crashes.Olivier Goffart2010-08-132-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1622-239/+180
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add version 0.42 of libconninet. Remove version 0.41 of libconninet. Register QNetworkConfigurationPrivatePointer metatype. Mutex is already locked when private member function is called. Fixed a typo when doing a lock. The QNetworkConfigurationManager did not get the online status correctly even when there was an active connection. Release lock before calling into icd engine. Do not change the session configuration state because of changes Doc: removed assistant style and reintroduced the index page icons. Cocoa: Stacking order of modal dialogs is wrong qdoc: Added the fix to change qml-qml-file.name to qml-file.name Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa) Make this constructor explicit in Qt too. Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
| * \ Merge remote branch 'staging/4.7' into bearermanagement/maemo-fixesAaron McCarthy2010-08-1612-64/+41
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1312-64/+41
| | |\ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: removed assistant style and reintroduced the index page icons. Cocoa: Stacking order of modal dialogs is wrong qdoc: Added the fix to change qml-qml-file.name to qml-file.name Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa) Make this constructor explicit in Qt too. Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-136-9/+28
| | |\ \
| | | * | Cocoa: Stacking order of modal dialogs is wrongRichard Moe Gustavsen2010-08-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modal dialogs were sometimes hidden behind other normal windows on screen. The reason was that, upon going modal for a window, we actually resat the stacking level on the window in a faulty attempt to respect any stays-on-top window flags. This patch makes sure we avoid doing that, and at the same time, ensures we don't reintroduce the original bug as well. Task-number: QTBUG-12841 Reviewed-by: cduclos
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-134-0/+19
| | | |\ \
| | | | * | Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)Prasanth Ullattil2010-08-134-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special Characters' item to the 'Edit' menu. Before adding a new entry it will make sure that menu items list doesn't contain an item with the selector 'orderFrontCharacterPalette' & a 'nil' target. We need to return the index for the first entry (we have QCocoaMenuLoader as target). Task-number: QTBUG-12842 Reviewed-by: Denis
| | | * | | qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
| | | |/ /
| | * | | Doc: removed assistant style and reintroduced the index page icons.Morten Engvoldsen2010-08-132-41/+4
| | |/ /
| | * | Make this constructor explicit in Qt too.Aaron McCarthy2010-08-131-4/+0
| | | |
| | * | Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-133-10/+9
| | |/ | | | | | | | | | Wrap new APIs in ifndef QT_MOBILITY_BEARER.
| * | Add version 0.42 of libconninet.Aaron McCarthy2010-08-1636-0/+9977
| | | | | | | | | | | | Minor update. Fixes infinite loops.
| * | Remove version 0.41 of libconninet.Aaron McCarthy2010-08-1639-10054/+0
| | |
| * | Register QNetworkConfigurationPrivatePointer metatype.Aaron McCarthy2010-08-161-0/+1
| | |
| * | Mutex is already locked when private member function is called.Aaron McCarthy2010-08-161-3/+2
| | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/icd/qicdengine.cpp
| * | Fixed a typo when doing a lock.Aaron McCarthy2010-08-161-2/+1
| | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/icd/qicdengine.cpp
| * | The QNetworkConfigurationManager did not get the online status correctly ↵Tomasz Bursztyka2010-08-162-28/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | even when there was an active connection. Fixes: NB#181984 - QNetworkConfigurationManager reports offline even when connected. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@nokia.com> Signed-off-by: Jukka Rissanen <jukka.rissanen@nokia.com>
| * | Release lock before calling into icd engine.Aaron McCarthy2010-08-161-5/+6
| | |
| * | Do not change the session configuration state because of changesJukka Rissanen2010-08-161-2/+0
|/ / | | | | | | | | | | | | in QNetworkConfigurationManager. The session state is only changed according to status messages sent by icd. Fixes: NB#182148 - QNetworkSession changes to disconnected state immediately after opening session
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-135-2/+89
|\ \ | |/ |/| | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add autotest that checks that copy and cut don't work when echomode is set to hide text/password mode Clear previous animation data for non-triggering animations. Fix configure -help output. declarative module is built by default.
| * Add autotest that checks that copy and cut don't work when echomode is set ↵Joona Petrell2010-08-131-0/+24
| | | | | | | | | | | | | | to hide text/password mode Task-number: QTBUG-12086 Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-134-2/+65
| |\ |/ / | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Clear previous animation data for non-triggering animations. Fix configure -help output. declarative module is built by default.
| * Clear previous animation data for non-triggering animations.Michael Brasser2010-08-133-0/+63
| | | | | | | | | | | | | | We need to clear the data from the last run if the animation doesn't match any of the state actions (or if there are no actions). Task-number: QTBUG-12805
| * Fix configure -help output. declarative module is built by default.Martin Jones2010-08-131-2/+2
| | | | | | | | Task-number: QTBUG-12840
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-134-104/+100
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Clean up rasterfallback mechanism in DirectFB QNAM HTTP: Fix crash related to aborted uploads
| * | Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-122-103/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken <agbakken@gmail.com>
| * | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| | | | | | | | | | | | Task-number: QTBUG-12285
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-122-8/+15
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make bld.inf target in Symbian mkspecs to depend on .pro file
| * | Make bld.inf target in Symbian mkspecs to depend on .pro fileMiikka Heikkinen2010-08-122-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-122-15/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices. Phonon; Update CMakeLists.txt
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-122-15/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices. Phonon; Update CMakeLists.txt
| | * | | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Justin McPherson2010-08-12330-8853/+20799
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-08-06172-1975/+4228
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 4.7
| | * | | | | Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-124-5/+31
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Properly emit geometryChanged() when the position change. QCoreApplication::library path, ensure mutex lock ordering Fix memory leak.
| * | | | | | Properly emit geometryChanged() when the position change.Alexis Menard2010-08-122-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann
| * | | | | | QCoreApplication::library path, ensure mutex lock orderingOlivier Goffart2010-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not keep the libraryPathMutex locked while calling QFactoryLoader::refreshAll QFactoryLoader also lock a mutex, and recurse into QCoreApplication::libraryPath Reviewed-by: Brad Helgrind warning for reference: ==8442== Thread #1: lock order "0xDEBA470 before 0xDF63600" violated ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x8025A8E: QCoreApplication::libraryPaths() (qcoreapplication.cpp:2234) ==8442== by 0x8006FDC: QFactoryLoader::update() (qfactoryloader.cpp:109) ==8442== by 0x8006F32: QFactoryLoader::QFactoryLoader(char const*, QString const&, Qt::CaseSensitivity) (qfactoryloader.cpp:99) ==8442== by 0x6DE4351: qt_guiPlatformPlugin() (qguiplatformplugin.cpp:101) ==8442== by 0x6DE7A5B: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:934) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227) ==8442== Required order was established by acquisition of lock at 0xDEBA470 ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x8025FC3: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2335) ==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227) ==8442== followed by a later acquisition of lock at 0xDF63600 ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x80086A9: QFactoryLoader::refreshAll() (qfactoryloader.cpp:249) ==8442== by 0x802607E: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2344) ==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227)a
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-121-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix memory leak.
| | * | | | | Fix memory leak.Sarah Smith2010-08-121-3/+8
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac only bug - run examples/opengl/overpainting under leak detect instrument on Mac OSX to see it. Memory leak in any application that called getProcAddress() - CFStrings have to be cleaned up if the name of the function you got them from contains the word "Create" - and we weren't doing that. Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-128-31/+30
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Destroy the old runtime system only when existing pixmaps were migrated. Fixed autotest failure in tst_qgl::clipTest. Added way to destroy the share widget in the GL graphics system. qdoc: All references to -assistant and -base were removed.
| * | | | | Destroy the old runtime system only when existing pixmaps were migrated.Michael Dominic K2010-08-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2448 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Fixed autotest failure in tst_qgl::clipTest.Samuel Rødal2010-08-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change fb00d5003ac5d91953a95d8164180f8f56a2b0f2 introduced a slight behavioural change by leaving the surface handle dangling. We need to unset the surface handle even if we don't own it to make sure we don't access it again. Reviewed-by: Gunnar Sletta
| * | | | | Added way to destroy the share widget in the GL graphics system.Samuel Rødal2010-08-122-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us destroy the share widget temporarily if we want to free up OpenGL resources for a while. Reviewed-by: Gunnar Sletta
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1297-8890/+4952
| |\ \ \ \ \ | | |/ / / /
| * | | | | qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-124-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flags allowed are now -creator and -online. -creator is the default.
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-1210-46/+189
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed build failure Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| * | | | | Fixed build failureGareth Stockwell2010-08-123-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12713
generated by cgit v0.12 at 2025-01-18 09:17:25 (GMT)