summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-234-8/+9
| | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2332-89/+1090
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed touch event delivery in QGraphicsView. let WebKit inject itself into the qt configuration add indirect input/output specification capability to QMAKE_SUBSTITUTES Add test that exercises lupdate warnings for QtScript Make qsTrId() / QT_TRID_NOOP() accessible from QtScript Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP() Add support for comments and meta-data in the lupdate QtScript frontend Streamline lupdate's QtScript frontend's error messaging Doc: linking up orphant files Doc: Updating menu links
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2332-89/+1090
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed touch event delivery in QGraphicsView. let WebKit inject itself into the qt configuration add indirect input/output specification capability to QMAKE_SUBSTITUTES Add test that exercises lupdate warnings for QtScript Make qsTrId() / QT_TRID_NOOP() accessible from QtScript Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP() Add support for comments and meta-data in the lupdate QtScript frontend Streamline lupdate's QtScript frontend's error messaging Doc: linking up orphant files Doc: Updating menu links
| | * Fixed touch event delivery in QGraphicsView.Denis Dzyubenko2010-08-232-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a touch event with a second touch pressed is delivered inside graphicsview, we should combine it with the closest touch point even if the item under the second touch is not direct ancestor or child of the first touches' target item. So adding a second touch inside the item's bounding rect will send a TouchUpdate event to the item instead or starting a new touch event sequence. Task-number: QT-3795 Reviewed-by: Bradley T. Hughes
| | * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-238-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
| | * add indirect input/output specification capability to QMAKE_SUBSTITUTESOswald Buddenhagen2010-08-234-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like in SUBDIRS, the specified strings can now be basenames of "structures" which specify the actual input and output files: QMAKE_SUBSTITUTES += test test.input = infile.txt.in test.output = foobar.out Reviewed-by: joerg
| | * Add test that exercises lupdate warnings for QtScriptKent Hansen2010-08-234-0/+118
| | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
| | * Make qsTrId() / QT_TRID_NOOP() accessible from QtScriptKent Hansen2010-08-236-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptEngine::installTranslatorFunctions() now installs wrapper functions for qsTrId and QT_TRID_NOOP (similar to the existing ones for tr() and translate()). Task-number: QTBUG-8454 Reviewed-by: Jedrzej Nowacki
| | * Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()Kent Hansen2010-08-234-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extracting the translation data is only the first step; a separate commit will make the functions available in the QtScript runtime. Task-number: QTBUG-8454 Reviewed-by: Oswald Buddenhagen
| | * Add support for comments and meta-data in the lupdate QtScript frontendKent Hansen2010-08-235-22/+565
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the support more in line with the C++ frontend. No support for magic TRANSLATOR comment yet. Add a proper test for the QtScript parser. Support for qtTrId() and friends coming in a separate commit. Previously the lexer just skipped comments. Now the contents of each comment is retained and passed to a "comment processor" interface. The parser implements the interface and performs logic very similar to the C++ parser to extract data from the comment. Task-number: QTBUG-11774 Reviewed-by: Oswald Buddenhagen
| | * Streamline lupdate's QtScript frontend's error messagingKent Hansen2010-08-232-44/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the C++ parser, use a yyMsg() function. Make the lexer a member of the parser, so yyMsg() can access the filename and current line number. This refactoring is done in preparation of two changes that introduce quite a few more potential error message calls (comment processing and qtTrId support). Reviewed-by: Oswald Buddenhagen
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-231-1/+1
| | |\
| | * | Doc: linking up orphant filesMorten Engvoldsen2010-08-232-0/+5
| | | |
| | * | Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-232-7/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: QtConcurrent::run. Make sure the example actually compiles
| * | | Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-232-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::split has overload, and if you want to take the address of a function with overload, you need to cast it. If we really wanted to use QString::split, we would have to do QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive); So use QByteArray::split as an example instead Task-number: QTBUG-12897 Reviewed-by: David Boddie
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-232-2/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible. QWidget metadata has not been set up yet in QWidgetPrivate::init.
| * | | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise application crashes because rendering to invisible window surface will panic eventually. Reviewed-by: Trond
| * | | QWidget metadata has not been set up yet in QWidgetPrivate::init.Jani Hautakangas2010-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | q->inherits("QGLWidget") gives incorrect result, so use QWidgetPrivate::isGLWidget variable instead. Reviewed-by: Jason Barron
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-231-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: update the documentation of NOTIFY signal to reflect reality
| * | | | Doc: update the documentation of NOTIFY signal to reflect realityOlivier Goffart2010-08-231-4/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thorbjorn
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-231-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: changing template menus to better reflect links from the index page.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-231-3/+5
| |\ \ \ |/ / / / | | | _ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: changing template menus to better reflect links from the index page.
| * | Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-231-1/+1
|\ \ \ | |_|/ |/| | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move link for Declarative UI Runtime to Using QML with C++ section
| * | Move link for Declarative UI Runtime to Using QML with C++ sectionBea Lam2010-08-231-1/+1
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2218-17/+62
|\ \ \ | |/ / |/| / | |/ | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Adding pages to the overviews and updating the index page. Doc: Updating pages and linking them to the overviews.
| * Doc: Adding pages to the overviews and updating the index page.Morten Engvoldsen2010-08-223-8/+17
| |
| * Doc: Updating pages and linking them to the overviews.Morten Engvoldsen2010-08-2215-9/+45
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-211-5/+18
|\ \ | |/ | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: bindTexture: Replace texture if painting is active on pixmap/image
| * bindTexture: Replace texture if painting is active on pixmap/imageAndreas Kling2010-08-211-5/+18
|/ | | | | | | This fixes an issue with WebKit canvases not updating after the first frame since there's always a QPainter open on their backing store. Reviewed-by: Samuel Rødal
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-202-5/+3
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QDeclarativeDebug: stream all the context, including the internals ones.
| * QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-202-5/+3
| | | | | | | | | | | | | | Some public context are within the internal context, so we need to stream them to get every objects Reviewed-by: Lasse Holmstedt
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2049-12219/+14008
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGS qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS Revised fix for pixmap loading Assistant: Clean-up - fix spelling mistakes. Assistant: Clean-up: Use const references in foreach loops. Assistant: Clean-up: Mark constructors as explicit. Assistant: Clean-up - add newlines to end of files. 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
| * | 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>
generated by cgit v0.12 at 2025-09-13 20:20:20 (GMT)