| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
| |
This improves the INSERT performance dramatically, since we won't wait
anymore until all data is written back to the database. Should not have
any impact on the database consistency in case of an app crash, only in
case the whole OS crashes, but then you might be in trouble anyway.
Reviewed-by: ck
|
|
|
|
|
|
| |
They usually don't exist, so we'd just be adding noise otherwise.
Reviewed-by: kh1
|
|
|
|
|
|
|
| |
Not strictly needed, but it seems nicer to have a removePath()
for every addPath().
Reviewed-by: kh1
|
|
|
|
| |
Reviewed-by: kh1
|
|
|
|
| |
Done with Christian Kandeler.
|
|\
| |
| |
| |
| | |
Conflicts:
configure.exe
|
| | |
|
| |
| |
| |
| | |
With the QT_USE_OPERATOR_PLUS, we need to cast before converting to QVariant
|
| | |
|
|/
|
|
| |
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
Add convenience function QTextCursor::positionInBlock()
Fixed URL in Russian translation.
Designer/Resourceview: Suppress warning about QFileInfo on empty path.
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
optimize QList::mid()
optimization: use QList::reserve() in QSet::toList()
add QList::reserve()
...
|
| | | |
| | | |
| | | |
| | | | |
Add some more flexible approach to rename, export and import bookmarks.
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
|
| | |/
| |/|
| | |
| | |
| | |
| | | |
QT_NO_WEBKIT is not defined until qglobal.h has been included.
Reviewed-by: Daniel Pope
|
|\ \ \
| |_|/
|/| |
| | |
| | | |
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7821
Reviewed-by: kh1
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh1
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix broken image loading on windows.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make sure the url is valid and we could find the file in the compressed
help, otherwise pass on an error message. We might have got garbage in
the first patch, so the isEmpty() check was not sufficient.
Do not integrate in master, since it was fixed already there.
Task-number: QTBUG-8082, QTBUG-8248
Reviewed-by: ck
|
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
You need to ensure qconfig.h is included before you can check if
QT_NO_WEBKIT is defined.
Reviewed-by: kh1 <qt-info@nokia.com>
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
Fix copyright year.
Fix broken license headers.
doc: Fixed some qdoc errors.
Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
doc: Fixed some qdoc errors.
QNetworkAccessManager: add method to send custom requests
doc: Fixed some qdoc errors.
Optimization: Avoid calling out to public API function
Mac: submenu shows up at the wrong position
Add operator< and qHash for QSharedPointer and fix operator-.
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|/ /
| |
| |
| | |
Reviewed-by: kh1
|
| |
| |
| |
| | |
Reviewed-by: ck
|
| |
| |
| |
| |
| |
| |
| |
| | |
Move the QTextBrowser based help viewer into it's own source files
and introduce a common base clase that currently only contains the
statics, but more to come for common stuff.
Review: ck
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
| |
| |
| |
| | |
For unknown reasons, the assumption does not hold at times.
|
| |
| |
| |
| | |
Reviewed-by: ck
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
A few trivial optimizations
Rewrote bookmark handling, the previous code was just plain awful.
Small style cleanup.
Fix some warnings.
Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
Designer: Support the 'windowOpacity'-property for forms.
Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
Assistant: Treat "unfiltered" filter in a apecial way.
Assistant: Give meaningful context to translations.
Fixed handling of paths containing ".." in QFileSystemModel on Windows.
QAbstractItemModel docs: Fix typo.
Assistant: Eliminate private tr contexts.
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-2603
Reviewed-by: ck
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: ck
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Don't put the translated string into the help engine.
- Don't let it be edited by users.
Reviewed-by: kh1
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: kh1
Instigated-by: Friedemann Kleint
|