summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-1/+1
| | | | | Task-number: QTBUG-12807 Reviewed-by: TrustMe
* qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-0/+1
| | | | | | | Don't add the PDB file name to ForcedIncludeFiles. Task-number: QTBUG-12802 Reviewed-by: TrustMe
* Revised fix for pixmap loadingJens Bache-Wiig2010-08-202-0/+7
| | | | | | | | | | | | Change 2c8f9dee611 had an unwelcome side-effect and was reverted. Since we do have the undocumented behavior that we scan for all possible extensions when QPixmap is provided with a filename without extensions we could not simply exit if the file did not exist. We now check if there are extensions before doing so. Reviewed-by: gabi Task-number: QTBUG-11137
* Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
|
* Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
|
* Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
|
* Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2029-12196/+13974
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| * Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-204-7/+11
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-201-2/+2
| |\
| | * Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts, for example Norwegian, which prevents you from typing the @ symbol. Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-2021-12180/+13946
| |\ \ | | |/
| | * Update Japanese translationsTakumi ASAKI2010-08-207-8756/+7602
| | | | | | | | | | | | | | | Merge-request: 767 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Ukrainian translation updatedVictor Ostashevsky2010-08-207-3379/+6261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some spell and stylistic fixes applied, new messages appeared in assistant and linguist translated and everything except xmlpatterns in qt also translated. Thanks KDE Ukrainian localisation team for some useful hints. Merge-request: 782 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * qtconfig and qvfb internationalization fixesTasuku Suzuki2010-08-204-32/+59
| | | | | | | | | | | | | | | | | | | | | | | | - install QTranslators in qtconfig and qvfb - add tr() to qvfb strings Merge-request: 783 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * add full width characters to ending() in linguistTasuku Suzuki2010-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | U+FF01 (FULLWIDTH EXCLAMATION MARK), U+FF1F (FULLWIDTH QUESTION MARK) and U+FF1A (FULLWIDTH COLON) Merge-request: 2455 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filterRichard Moe Gustavsen2010-08-201-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using namefilters in the non-native file dialog is a bit broken by design, since it don't store the whole selected name filter, but only the filter with details stripped off (if this is specified). And it stores this data in gui widgets. And the native file dialog also suffers from this. At least this patch will pick the first matching name filter (with details) given a details-stripped version. Task-number: QTBUG-12870 Reviewed-by: cduclos
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-201-1/+1
| | |\
| | * | qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| | | | | | | | | | | | | | | | Task-nr: QTBUG-11113
| * | | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-203-6/+14
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-2029-106/+544
| |\ \ | | |/
| * | just build connman and networkmanager plugins on linuxLorn Potter2010-08-201-1/+1
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-2016-25/+495
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Introduce QtOpenGL module for Symbian.
| * | | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-2016-25/+495
| | |/ | |/| | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2013-195/+285
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow QML Quit buttons to work inside QtDemo. Fix minehunt demo for Symbian Add a quit button to declarative examples in QtDemo Without Declarative, still build and run QtDemo
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-207-146/+216
| |\ \
| | * | Fix minehunt demo for SymbianJoona Petrell2010-08-207-146/+216
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8927 Reviewed-by: Alan Alpert
| * | | Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-204-3/+11
| |/ / | | | | | | | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-201-13/+13
| |\ \ | |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-207-45/+353
|\ \ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doing "import foo.qml" doesn't work in QML anymore Add info to Loader docs about receiving signals and key events
* \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-191-13/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure geometry of top-level widget accounts for S60 screen furniture
| * | | | Ensure geometry of top-level widget accounts for S60 screen furnitureGareth Stockwell2010-08-191-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the S60 screen furniture has already been constructed before QWidgetPrivate::show_sys() is called on a top-level widget which has Qt::WindowMaximized set (e.g. due to a showMaximized() call), its geometry is set to the full screen extent, including the regions covered by the status bar and CBA. This patch ensures that calculation of the widget geometry always takes into account the screen furniture. Task-number: QTBUG-12605 Reviewed-by: Jason Barron
| | | * | Add a quit button to declarative examples in QtDemoAlan Alpert2010-08-201-33/+25
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-2045-222/+783
| | | |\ \ | | | |/ / | | |/| |
| | * | | Doing "import foo.qml" doesn't work in QML anymoreBea Lam2010-08-201-6/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13042
| | * | | Add info to Loader docs about receiving signals and key eventsBea Lam2010-08-206-39/+349
| |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-194-8/+43
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fatal crash on solaris 64 bit qdoc: Added more elements to qt.pageindex doc: Removed comment about automatic inclusion of 3rd party library. qdoc3: Added more pagewords & elements to the search index. qdoc3: Added more pagewords & elements to the search index.
| * | | Fatal crash on solaris 64 bitCarlos Manuel Duclos Vergara2010-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a dummy variable for a function call, and that variable is causing a data misalignment. Changing the type to long fixes the issue. According to Denis it is ok to change this for all cases. Task-number: QTBUG-12928 Reviewed-by: Denis Dzyubenko
| * | | qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | | | | | | | | | | | | | Task-nr: QTBUG-11113
| * | | doc: Removed comment about automatic inclusion of 3rd party library.Martin Smith2010-08-191-4/+2
| | | | | | | | | | | | | | | | It must be copied into the appliv=cation bundle automatically.
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-199-12/+4
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-191-0/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc3: Added more pagewords & elements to the search index.
| * | | | | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-192-3/+4
| | |/ / / | |/| | | | | | | | | | | | | Task-nr: QTBUG-11113
| * | | | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | |_|/ | |/| | | | | | | | | | Task-nr: QTBUG-11113
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-198-28/+131
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes a regression preventing loading images without extensions Made GL pixmap backend respect Qt::NoOpaqueDetection flag.. QTextCodec: fix wodring of a comment QDeclarativeImageProvider: Do not keep the global declarative mutex locked when processing.
| * | | Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-192-8/+13
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12560 Reviewed-by: gabi
| * | | Made GL pixmap backend respect Qt::NoOpaqueDetection flag..Samuel Rødal2010-08-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to do the opaque image scan when the Qt::NoOpaqueDetection flag is set. Reviewed-by: Trond
| * | | QTextCodec: fix wodring of a commentOlivier Goffart2010-08-191-2/+4
| | | |
| * | | QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-194-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-199-12/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix Image element svg autotest