| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Task-number: QTBUG-15787
Task-number: QTBUG-15788
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Fixed handling of QInputMethodEvents with nonzero replacementLength.
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
Documented usage of dialogs on Symbian
Native file dialog on Symbian^3
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
...
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/ |
|
|
|
|
|
| |
Task-number: QTBUG-14393
Reviewed-by: ck
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-13619
Merge-request: 2486
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|
|
|
|
|
|
| |
This is intended to keep the internal documentation out of the
"custom help viewer" use case, where it does not belong.
Reviewed-by: kh1
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
| |
Help message and command line parsing errors will be shown translated
Merge-request: 2466
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Merge-request: 2456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QTranslator is installed in tools (qcollectiongenerator, qhelpconverter,
qhelpgenerator, lconvert, lrelease, lupdate).
Build targets that updates .ts files are changed to include strings from
this tools.
Merge-request: 2456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
this re-uses an existing string and obsoletes another one, so it is ok
during string freeze.
|
| |
|
|
|
|
|
|
|
|
| |
Surprisingly, the QML documentation is not integrated into the Qt docs,
so it has to be explicitly included.
Task-number: QTBUG-12625
Reviewed-by: kh1
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
|
|
|
|
|
|
|
|
| |
This is (supposedly) more efficient as the compiler can optimise it to a
builtin, per Thiago.
Merge-request: 2430
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
|
|
|
|
|
|
|
|
| |
there are now per-language ts-<package>-<lang> and ts-<lang> targets to
update only the files relevant for a given language.
there is also a ts-all target which does what the old ts target did.
the ts-<package> targets are now named ts-<package>-all and should not
be used manually - they exist for the convenience of the ts-all target.
the ts target is now only a help blurb.
|
|
|
|
|
|
| |
lupdate is now powerful enough to use the real project files.
this avoids that the file lists run out of sync (which they did, though
not as much as i expected).
|
|
|
|
|
|
| |
lupdate currently doesn't parse .qmake.cache, so it lacks
QT_SOURCE_TREE. so use relative paths in include statements and (the
relevant) include paths instead.
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-11911
Reviewed-by: ck
|
|
|
|
| |
Reviewed-by: kh
|
|
|
|
|
| |
Task-number: QTBUG-10629
Reviewed-by: kh
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
|
|
|
|
|
|
| |
Please do not merge to master, we had to fix it different there.
Because of async content loading, we have to cache the url to load. A
combination of SetSource and SyncContents would have lead to sync to the
old url till loading was finished. So return the cached during loading.
Task-number: QTBUG-11342
Reviewed-by: ck
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
| |
Task-number: QT-1520
|
|
|
|
|
| |
Task-number: QTBUG-11049
Reviewed-by: ck
|
|
|
|
| |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|
|
|
|
| |
Task-number: QTBUG-10579
Reviewed-by: ck
|
|
|
|
|
| |
Task-number: QTBUG-10575
Reviewed-by: ck
|
|
|
|
|
|
|
|
| |
Make the check more generic, to also work for all other Qt namespaces
than qt.ver.s.ion. Still there's something broken in Qt webkit or so.
Backported from Qt Creator code.
Reviewed-by: ck
|
|
|
|
|
|
|
|
| |
Fixes the broken topic chooser and keyword resolving. We are only
interested in the extention, which fails if we get an url e.g. with
anchor attached.
Reviewed-by: ck
|
|
|
|
| |
Reviewed-by: kh
|
|
|
|
| |
(Building Qt in namespace)
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
...
|
| | |
|
| |
| |
| |
| |
| | |
Written-by: kh1
Reviewed-by: ck
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-4519
Reviewed-by: kh1
|
|/
|
|
|
| |
Task-number: QTBUG-9651
Reviewed-by: ck
|