| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QTBUG-11049
Reviewed-by: ck
|
|
|
|
| |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits)
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
...
|
| | |
|
|/
|
|
|
| |
Task-number: QTBUG-4519
Reviewed-by: kh1
|
|
|
|
| |
Reviewed-by: ck
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: kh1
|
|\
| |
| |
| |
| | |
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:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7821
Reviewed-by: kh1
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: kh1
Instigated-by: Friedemann Kleint
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merging private tr contexts into the surrounding class keeps
related strings together.
Contributed-by: Ritt Konstantin
Reviewed-by: kh1
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh1
|
|\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| | |
Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c
Contributed-by: Ritt Konstantin
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7420
Reviewed-by: kh1
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Update Polish translations
Assistant: Add documentation for -remove-search-index.
Designer: Handle "visible"-properties of item view headers correctly.
Fix .gitignore to not ignore qdoc.pro
Update polish translations
Fix broken delete key, some cleanup.
Assistant: Fix race condition in index creation.
Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh1
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
|
| |/
| |
| |
| |
| |
| |
| | |
uses of QT_DEPRECATED must be protected by #ifdef
Task-number: QTBUG-6649
Reviewed-by: João Abecasis
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
| |
| |
| |
| |
| |
| |
| | |
- Get rid of double container lookups for conditional access.
- count() == 0 => isEmpty().
Reviewed-by: kh1
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
We need to make sure the running thread can respond to the cancel
request before overwriting it.
Reviewed-by: kh1
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| |\ |
|
| | |
| | |
| | |
| | | |
Over src/ tools/ examples/ and demos/
|
| | |
| | |
| | |
| | | |
Reviewed-By: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a bug that can only be seen on windows when we have the
collection storage location on e.g. Drive c:\ while the help files
reside on a different drive.
QHelpEngineCore::registerDocumentation would fail to gather the proper
relative file path, thus register the file with it's absolute path. In
QHelpEngineCore::documentationFileName we still assumed that all files
in the collection are registered relative and fail to concatenate the
proper path. Now we check if the path is already absolute and return.
Reviewed-by: ck
|
| |\ \
| | |/ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We look up all "a href" and "img src" link in the project's HTML
files and give a warning if the link target does not exist or is
not listed in the project's filter sections.
Task-number: QTBUG-2485
Reviewed-by: kh1
|
|\ \ \
| | |/
| |/| |
|