summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add a qtimestamp.cpp with some common functions.Thiago Macieira2010-03-171-4/+30
| | | | | | | | | Had to add invalidate() and isValid() functions because that's what QUnifiedTimer expects (QAbstractAnimation). Also move restart() to each implementation for efficiency. Task-number: QT-2965
* Initial version of QTimestamp class.Thiago Macieira2010-03-172-0/+81
| | | | | | Only the generic, non-monotonic QTime-based version available right now Task-number: QT-2965
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-171-0/+3
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Display the itemSendScenePositionChange properly when debugging.
| * Display the itemSendScenePositionChange properly when debugging.Alexis Menard2010-03-171-0/+3
| | | | | | | | | | | | Also a harmless test added to check that the flag is actually set. Reviewed-by:TrustMe
* | QtScript: Fix regression when calling newQObject() from native constructorKent Hansen2010-03-161-0/+20
| | | | | | | | | | | | | | | | The thisObject passed to native constructors did not have all the new structure flags, so if it was promoted to a QObject (using the overload of newQObject() that takes an existing script object as first argument), the resulting script object did not receive dynamic property access callbacks.
* | QNetworkReply: Fix canReadLine()Markus Goetz2010-03-161-0/+17
| | | | | | | | Reviewed-by: Peter Hartmann
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1531-1766/+1090
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
| * SSL: Fix memleak related to local certificateMarkus Goetz2010-03-151-0/+15
| | | | | | | | | | | | | | | | Task-number: QTBUG-6504 Task-number: QTBUG-8924 Task-number: QTBUG-5645 Reviewed-by: andreas Reviewed-by: Peter Hartmann
| * Further fix license whitespace.Morten Johan Sørvig2010-03-151-40/+39
| |
| * Remove NetworkManager test-bed application.Aaron McCarthy2010-03-158-1803/+0
| |
| * Fix up whitespace in license headers.Qt Continuous Integration System2010-03-127-273/+273
| | | | | | | | Reviewed-by: Trustme
| * Autotest: make the qabstractslider test pass on macRichard Moe Gustavsen2010-03-111-0/+15
| | | | | | | | | | | | | | | | Since we changed the behaviour for scrolling on mac to not be restriced to an upper limit (pagestep), we need to adjust the auto test accordingly Rev-by: prasanth
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1022-7/+1105
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Compile QtScript: Improve performance of type resolution when calling slots Improve performance of QScriptValueIterator Add default argument values for QScriptValuePrivate property functions Move method implementation to private class Add benchmarks for QScriptValueIterator Fixed the QML browser built into the QML viewer Make configure.exe fail for declarative if no script support Add QWidget::update() test. Add license headers Import static contents tests from old manualtests Fix Build Failure for Maemo 5 Debug Build Add ability to read last mod.time for zip entry. Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries Add isValid() method to QZipReader::FileInfo. Add `QIODevice* device() const` public method to QZip classes. Rebuild configure.exe (again enable QtDeclarative module by default) Update src/3rdparty/javascriptcore and adapt src/script to the changes Use index-based approach for iterating over JS array properties QFSFileEngine reduce number of system calls ...
| | * Add benchmarks for QScriptValueIteratorKent Hansen2010-03-102-0/+300
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain
| | * Add QWidget::update() test.Morten Johan Sørvig2010-03-101-1/+50
| | | | | | | | | | | | | | | Test that QWidget::update sends minimal updates, both for the rect and region version.
| | * Add license headersMorten Johan Sørvig2010-03-108-0/+329
| | |
| | * Import static contents tests from old manualtestsMorten Johan Sørvig2010-03-1015-0/+368
| | |
| | * Add ability to read last mod.time for zip entry.Ritt Konstantin2010-03-101-0/+4
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Avoid asserting when index passed to QZipReader::entryInfoAt is out of ↵Ritt Konstantin2010-03-101-0/+3
| | | | | | | | | | | | | | | | | | boundaries Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Add isValid() method to QZipReader::FileInfo.Ritt Konstantin2010-03-101-0/+4
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-104-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update qscriptvalueiterator test to expect length property when iterating arrays and strings. - Use EvalExecutable::create() instead of EvalExecutable constructor. The constructor is private. - Reimplement getOwnPropertyDescriptor() in all custom script objects. - Remove all reimplementations of getPropertyAttributes(). It doesn't exist in trunk anymore (getOwnPropertyDescriptor() is used instead). - Remove checkDontDelete argument from deleteProperty() reimplementations. The purpose of this argument was to support deleting properties with attribute Undeletable from C++. But it was quite an invasive patch to JavaScriptCore, and it doesn't seem worth it. If this feature is really crucial it should be re-done upstream. One of the tests needed to be updated so it's not sensitive to the C++ undeletability. - Adapt getOwnPropertyNames() reimplementations to signature change. - Add missing QScriptObject structure flags, otherwise we don't get all virtual calls. - Remove our patch for reporting column numbers in the debugger callbacks. It was just too intrusive. As with the checkDontDelete issue, this should be redone upstream if it's really important. In 4.7, QScriptEngineAgent will always report a column number of 1. Other compilation fixes: - InternalFunction::name() takes an ExecState* argument, not GlobalData* - ScopeChain::globalObject is no longer a function but a member variable - ScopeChainNode constructor takes a GlobalObject argument - Heap::collect() is called collectAllGarbage() - JSValue::strictEqual() takes an ExecState* argument - Debugger::exception() takes a bool hasHandler argument - Debugger no longer reports column number (we decided to drop that patch from JSC) - UString doesn't have operator+=(char*) - Update the autotests to reflect the columnNumber=1 change. - Add helper class to avoid crashing inside JSC. Ever since r52856 in WebKit trunk, this is needed. There are probably a lot of other public API functions that need this guard as well, but I'll add them as they are discovered. - Update mkdist-javascriptcore tag, exclude a few more files. - Set ENABLE_JSC_MULTIPLE_THREADS=0 define on Mac due to r52355 in trunk. Reviewed-by: Simon Hausmann
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1584-758/+1290
|\ \ \ | |/ / |/| | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * | QSslKey: Do not make OpenSSL prompt for a password on stdinMarkus Goetz2010-03-153-0/+105
| | | | | | | | | | | | | | | Task-number: QTBUG-2515 Reviewed-by: Andreas Aardal Hanssen
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-121-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: HotFix for fluidlauncher default size caused by 6d44dadd. Removed compiler warning from qdesktopwidget_s60.cpp.
| | * | HotFix for fluidlauncher default size caused by 6d44dadd.Janne Anttila2010-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that in Symbian we cannot restore Qt::WA_Moved and Qt::WA_Resized attributes in setWindowState method to the same ones what the attributes were when method was called. Thus we currently make sure that Qt::WA_Moved and Qt::WA_Resized attributes are not touched when normal window state is applied. There is a new task QTBUG-8977 to sort out when those attributes should be set and when not. Reviewed-By: Sami Merila
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-111-0/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in QTransform::type() after using operator/ or operator*.
| | * | Fixed bug in QTransform::type() after using operator/ or operator*.Samuel Rødal2010-03-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The m_dirty variable is not a bit flag any more. This caused the switch in QTransform::type() to not match any of the transformation types, and m_type was left at TxNone. Task-number: QTBUG-8557 Reviewed-by: Gunnar Sletta
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-1154-57/+212
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support for adding user specified list type content in rss file Fixed RSS_RULES statement in application_icon.prf XFAIL for a new qwidget autotest on MAC and QWS. Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
| | * | XFAIL for a new qwidget autotest on MAC and QWS.Janne Anttila2010-03-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Widget attributes seems to be inconsistently set on different platforms. There are two task to harmonize the attributes on different platforms: QTBUG-8941 and QTBUG-8911 The tests were XFAIL:d in order that S60 integration is not blocked. Reviewed-by: Jason Barron
| | * | Fixed dialog resize not to move the dialog for Symbian.Janne Anttila2010-03-101-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDialog::resize() also moved the dialog in Symbian. This occured since adjustPosition was called as an result of resize and that method did not check if dialog position was explicitly set. In addition it was found that in Symbian WA_Resized and WA_Moved attributes were basically set for almost all top-level widgets by system. This was also fixed and a new auto test was introduced to verify these attributes in all platforms. Windows platform also suffers from bug in this area, and a separate task QTBUG-5897 for it was created Task-number: QTBUG-5897 Reviewed-by: Sami Merila
| | * | Merge branch 'mmfphonon' into 4.6Frans Englich2010-03-104-8/+106
| | |\ \
| | | * | Fix SDP files are not supported.Frans Englich2010-03-104-8/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon glue code rejected SDPs based on the MIME type for SDPs. Task-number: QTBUG-8702 Reviewed-by: Gareth Stockwell
| | * | | Renamed test benchmark targets.Miikka Heikkinen2010-03-1049-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the benchmarks generate executables with same names as the autotests. This is a big problem for Symbian, where all binaries are stored into single directory. Renamed benchmark targets to include 'bench' in their name to ensure no overlap in target names. Part of QtP delta reduction effort. Reviewed-by: Liang Qi
| * | | | QVarLenghtArray: Call constructor when resizing the array for Movable types.Olivier Goffart2010-03-111-2/+45
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor of complex type that are declared as Movable (such as many of our containers) were not being called. The raison is that the 's' was set to 'asize' right after the qMemCopy So we need to reset 's' to old size in the movable case (in all cases) In the static case, 's' has already be incremented to osize The 's = asize;' can be removed as it is anyway done at the very end of the function Task-number: QTBUG-6718 Reviewed-by: Harald Fernengel
| * | | Fixes QSqlThread autotestBill King2010-03-101-3/+3
| | | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-03-103-0/+110
| |\ \ \
| | * | | Added very simple JPEG loading benchmark (using QImageReader)Markus Goetz2010-03-093-0/+110
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joao
| * | | | Parallelize DB autotests, also some factorizationBill King2010-03-1010-698/+738
| |/ / / | | | | | | | | | | | | | | | | | | | | Add local machine parallelization of auto-tests, not just host to host. Reviewed-by: Justin McPherson
| * | | QXmlSchema internals: include/import/redefine schemas only oncePeter Hartmann2010-03-0811-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Schema standard, loading a schema needs only be done once for each schema location. Currently, there was a problem with indirect includes (and imports/redefines): a In this scenario, schema a would only remember to have loaded / \ b, but not d, which resulted in an error when c was loading d b c again and the types in d were redefined. | | d d Reviewed-by: Tobias Koenig <tokoe@kde.org> Task-number: QTBUG-8394
| * | | QTableView: fix navigating with keyboard with spans not scrollingOlivier Goffart2010-03-081-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use isIndexHidden in ScrollTo because that would return true if the index is in a span. Task-number: QTBUG-8777 Reviewed-by: Markus Goetz
* | | | Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGLTom Cooksey2010-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget::renderPixmap now works under X11/EGL. Tested on both Fremantle and Harmattan. Reviewed-By: TrustMe
* | | | Update tst_QGL::getSetCheck to check for new (correct) behaviourTom Cooksey2010-03-101-6/+7
| | | | | | | | | | | | | | | | Reviewed-By: Trond
* | | | Fixes Q3ListViewItem grandchildren not sorted if item has one childAlexader Karaivanov2010-03-101-1/+125
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Q3ListViewItem::sortChildItems() used to exits early if there is only 1 child item and leaves grandchildren unsorted. Merge-request: 2260 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1013-25/+290
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Don't wait forever when scanning for wifi networks on win32 fails. Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown ...
| * \ \ Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0913-25/+290
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (82 commits) Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix ...
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0913-25/+290
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (80 commits) doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() ...
| | | * | | Improve performance of QTimer::singleShotMarkus Goetz2010-03-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid allocation of QObject and OS timer. Reviewed-by: Olivier Goffart
| | | * | | Add a benchmark comparing single shot timer with invokeMethodMarkus Goetz2010-03-092-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joao
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0910-25/+171
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding ...
| | | | * \ \ Merge remote branch 'origin/4.7' into 4.7Thiago Macieira2010-03-081-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/src.pro
generated by cgit v0.12 at 2024-10-14 04:53:55 (GMT)