| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The documentation root in the qdocconf file now refers to the Chinese
title for the Tutorials page.
Modified qdoc's function to canonicalize titles so that it preserves
characters that outside the range of ASCII letters and numbers.
Reviewed-by: Trust Me
|
| | |
| |
| |
| |
| |
| |
| | |
We now write UTF-8 encoded XHTML and assume all pure documentation which
isn't pure ASCII is now UTF-8 encoded.
Reviewed-by: Trust Me
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
| |
| |
| |
| |
| |
| | |
Also updated qdoc's configuration reader so that we can put UTF-8
content in the .qdocconf files later.
Reviewed-by: Trust Me
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other
documentation, and wrote out XHTML with the same encoding. This change
adds additional configuration options (sourceencoding, outputencoding,
naturallanguage) that enable translated documentation in non-Latin1
encodings to be built with qdoc.
To be reviewed before merge into the master branch.
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use a shared QScriptEngine for debugger console command scripts
Fix QtScript debugger hang/crash issue with updating locals model
doc: Fixed some qdoc warnings.
Always activate popup windows on show
doc: Fixed some qdoc warnings.
Add the QMAKE_FILE_EXT variable to extra compilers generation.
Cocoa: Tool Windows steal focus from the main window
qdoc3: Removed a debug output.
Update QTestLib documentation with chart use case.
|
| | | |_|/
| |/| | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant examples: Fix missing QLatin1String.
Added Czech translations.
Webkit: Fix missing namespace.
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 440
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: kh1
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix spelling errors, foreach()/QString usage, explicit constructors.
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
RVCT2.2 build 686 crashes when compiling the drawhelpers with
VFPv2 enabled. Until compiler workaround found, back out the
change.
This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37.
Conflicts:
configure.exe
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Documented limitations of add/setLibraryPath(s) on Symbian OS
Deployed QtMultimedia.dll on Symbian
Fixed the URL of known issues wiki page in docs
Fixing benchmark to be runnable on Symbian device
Fixing test to be runnable on Symbian devices.
Fixed no-timeout case for QProcess::waitForFinished in Symbian
Add visibility-inlines-hidden for GCCE on Symbian OS
Catch by reference rather than by value
Fixing benchmark for Symbian
Remove warning about Symbian DEF files when running configure for Windows
List item margins are too small due to invalid pixel metric value
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
Shortening and fixing previous fix for QTBUG-6371
Update default FPU flags on Symbian to be softvfp+vfpv2
Using RunFast mode for RVCT
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Move SYMBIAN_DEFFILES definition in the dictionary into the Symbian
specific section of configure
Task-number: QTBUG-6556
Reviewed-by: Simon Hausmann
|
| | | |\ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
Shortening and fixing previous fix for QTBUG-6371
Update default FPU flags on Symbian to be softvfp+vfpv2
Using RunFast mode for RVCT
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
Shortening and fixing previous fix for QTBUG-6371
Update default FPU flags on Symbian to be softvfp+vfpv2
Using RunFast mode for RVCT
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Aleksandar Sasha Babic
|
| |\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Remove obsolete OpenGL/ES CommonLite (fixed-point) support
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
| |/ / / / / / |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | /
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant: Fix unintended tr context change.
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c
Contributed-by: Ritt Konstantin
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
audio-backend option was not being written out to qconfig.pri
Task-number:QTBUG-7782
Reviewed-by:Justin McPherson
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix source code scanning issues.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Fix spelling errors, foreach()/QString usage, explicit constructors.
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a regression: icons with slightly wrong ICO header did not load.
Fixed an endless loop if printing web pages.
don't build unneeded QtDesigner parts on Windows CE
Better support for user-generated binary shaders
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We just build uitools like on Symbian.
The following subdirs have been removed from tools/designer/src/src.pro
tools/designer/src/lib
tools/designer/src/components
Reviewed-by: mauricek
|
| | | |
| | |
| | |
| | | |
normalize the user input first
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
if the pro file for the translations lives in a sibling tree of the
actual source tree, messages from included headers wouldn't have been
collected, as they were not considered part of the project.
Task-number: QTBUG-7495
|
| | | |
| | |
| | |
| | | |
this has always been kind of an omission ...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
previously, the semantics of nesting projects were pretty bizarre:
the list of TS files grew ever as the subdirs were visited. the
source files otoh were cleared for every project. this meant that
some TS files were updated over and over again, each time with different
data.
this is obviously total nonsense, so there is no compatibilty to keep.
so here come the new semantics:
- each project is scanned separately. it has separate include paths and
may override the inherited CODECFORSRC.
- the messages from all sub-projects are merged
- if a sub-project has a TRANSLATIONS entry, it is "detached" from its
parent project, thus starting an own merged translator. it is also
possible to name an empty set of TS files to simply exclude the
sub-project.
- CODECFORTR can be specified in each project with TRANSLATIONS
- if TS files are specified on the command line, they override
TRANSLATIONS from the top level project and stop processing of
detached projects alltogether. if multiple top-level projects are
specified, they are all merged.
this is somewhat slower, as now includes are re-scanned per project,
while previously all sources were simply accumulated and scanned as one
project. this can be fixed retroactively if needed.
|
