summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-30285-6654/+16375
|\
| * Doc: Implementing new doc search dialog.Morten Engvoldsen2010-09-293-88/+152
| | | | | | | | Removing search results from menus and including them in a floating dialog div element
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2845-4601/+679
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2857-4653/+861
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Added lisence header to snippet Doc: Fixing QTBUG-13595 Fix compile warnings (unused variables). Removing libconninet 3rdparty component. Closes properly the dbus connection in icd backend Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD. Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| | | * Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | | | | | | | | | | | | (cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
| | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-09-281-0/+3
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2857-4653/+819
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compile warnings (unused variables). Removing libconninet 3rdparty component. Closes properly the dbus connection in icd backend Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD. Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| | | * | Fix compile warnings (unused variables).Aaron McCarthy2010-09-282-1/+9
| | | | |
| | | * | Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2843-4595/+650
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of libconninet caused Qt to have a cyclic build dependency. Which was solved by embedding a copy as a 3rd party library. Maemo has since donated the libconninet code to Qt because (1) it was a private Maemo API and (2) the Qt ICD plugin is the only user of the library. This commit moves the relevent code from src/3rdparty/libconninet to src/plugins/bearer/icd and deletes the rest. Task-number: QT-3893
| | | * | Closes properly the dbus connection in icd backendAaron McCarthy2010-09-281-0/+2
| | | | |
| | | * | Connect/Disconnect requests needs to use the same dbus connection to ICD for ↵Aaron McCarthy2010-09-282-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the refcounting to work in ICD. Fixes NB#188145 - Network interface doesn't go down after last client disconnects
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2713-52/+152
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| | | | * | Added my changes to the changelog.axis2010-09-271-0/+12
| | | | | |
| | | | * | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-2714-11/+164
| | | | |\ \
| * | | | \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-4/+3
| |\ \ \ \ \ \
| | * | | | | | Doc: fixing slim fit style - search box.Morten Engvoldsen2010-09-281-4/+3
| | | | | | | |
| * | | | | | | Doc: add style to new search resultsMorten Engvoldsen2010-09-281-1/+79
| | | | | | | |
| * | | | | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-28129-668/+2199
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-0/+39
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-28125-634/+2144
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | | | | |
| | * | | | | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-282-34/+3
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Doc: Fixing QTBUG-13595Morten Engvoldsen2010-09-281-0/+3
| | | | | | | |
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2722-57/+220
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | |_|_|/ / | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-272-1/+2
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports
| | | | * | | Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bauhaus needs this export to manage layouts.
| | | | * | | Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert "Internal error: Plugin imported previously with different uri" happens on Windows. $QTDIR\imports, which is prefixed to the search path, is still written with backslashes. Unify this to forward slashes for all paths. Task-number:QTBUG-13994 Reviewed-by: mae
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-276-45/+54
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Moved the partial deployment section to qbase.pri. Made the Symbian menu close when switching native focus.
| | | | * | | Moved the partial deployment section to qbase.pri.axis2010-09-274-45/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way it will be available to all modules, not just selected ones. RevBy: Miikka Heikkinen
| | | | * | | Made the Symbian menu close when switching native focus.axis2010-09-272-0/+37
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was required to avoid windows appearing on top of the popup menu, preventing both the menu and the softkeys from being used. Task: QTBUG-9965 AutoTest: Included RevBy: Jason Barron
| | | * | | Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-2714-11/+164
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * staging: Document PropertyAnimation::targets property Fix test. Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | * | Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
| | | | | |
| | | | * | Fix test.Michael Brasser2010-09-271-0/+4
| | | | | |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2612-10/+152
| | | | |\ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2612-10/+152
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2412-10/+152
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2412-10/+152
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | | | | * | Small fixes to Browser.qmlJoona Petrell2010-09-241-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - focus highlight should not be shown if user presses any physical key, only when up, down, left and right arrow keys are pressed - hybrid devices (touch + four-way rocker) showed two highlight at the same time after using rocker and pressing the screen with finger - touch highlight had gradient, focus highlight one didn't - the width of the focus highlight didn't update when listview changed size (for example after orientation change) Task-number: Reviewed-by: Martin Jones
| | | | | | | * | More declarative autotests.Michael Brasser2010-09-2410-2/+110
| | | | | | | | |
| | | | | | | * | Fix example.Michael Brasser2010-09-241-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-265-55/+71
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-261-8/+11
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QHostInfo: Fix a crash when a new request is pushed while resolving.
| | | | * | | | | QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-261-8/+11
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loop looking for posponedLookup in the lookup thread wasn't locking the mutex before trying to access/modify the list. Reviewed-by: Andreas Kling
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-264-47/+60
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a compilation issue of tst_qsettings for win32-msvc. fix RSS listing example
| | | | * | | | Fix a compilation issue of tst_qsettings for win32-msvc.Liang Qi2010-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to include advapi32 for seperate usage of registry functions. Reviewed-by: Marius Storm-Olsen
| | | | * | | | fix RSS listing examplePeter Hartmann2010-09-243-47/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by handling HTTP 30X responses and using QNetworkAccessManager instead of QHttp. The server now sends back a HTTP 302 instead of a 200. Reviewed-by: Markus Goetz Task-number: QTBUG-13892
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2495-501/+1824
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-2411-5/+332
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
| | | | * | | | | Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2411-5/+332
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes Jay's fix for the JSC memory consumption on Symbian https://bugs.webkit.org/show_bug.cgi?id=34349 See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-246-25/+20
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QML Debugging: Documentation fixes dist/changes: QML Debugging changes Updated changes-4.7.1. Do not set DESTDIR to the current directory Fix dependency on the plugins rule for multimedia
generated by cgit v0.12 at 2024-09-21 10:57:05 (GMT)