| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Martin Smith
|
| |
|
|
|
| |
Reviewed-by: Denis Dzyubenko
Fixes: QTBUG-20228
|
| |
|
|
|
|
|
|
|
| |
Reviewed-by: David Boddie
Original-patch-by: Friedemann Kleint
(cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
(cherry picked from commit d62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0)
Reapplied after bad v4.7.4 merge
|
| |
|
|
|
|
|
|
|
|
| |
(The since argument can contain a project name and version, defaulting
to the qdoc project if only a version number is specified.)
Refactored common code into the Generator class.
Fixed \sincelist HTML generation for tables containing only one item.
(cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)
Reapplied after bad v4.7.4 merge
|
| |
|
|
|
|
| |
(cherry picked from commit 1ea0e706981006c48ad16a1ff8051df03610f20b)
Reapplied after bad v4.7.4 merge
|
| |
|
|
|
|
| |
this was uncovered by my don't-detach patch.
Reviewed-by: ossi
|
| |
|
|
|
|
|
| |
Replaced std::cout with QTextStream
Reviewed-by: Eckhart Köppen
(cherry picked from commit f078275a2a4b2a279a6fcc24df3c21fe8b21f007)
|
| |
|
|
|
|
|
|
|
| |
* Fix some inconsistent translations.
* Translate some missing messages.
* Update Japanese phrasebook.
Merge-request: 1249
Reviewed-by: ossi
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ \
| |/
|/| |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
Also updated the Config class for reuse.
|
| |\ \
| |/ |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
Added a function to class Config to unload the
qdocconf file. This is for the qdoc wizard.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Fix Symbian/Linux compilation breakage in plugins/qmltooling
Make QMLViewer startup animation stop after a while
Fix excessive scrolling in TextInput with mid string pre-edit text.
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-18621
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Fix so concurrent jobs produce the correct model results
Fix uninitialized variable.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Symbian.
Task-number: QTBUG-18764
Reviewed-by: kkoehne
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make the name less ambiguous, especially on Symbian were all .dlls end
up in sys\bin.
Reviewed-by: Pawel Polanski
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
look for makespec in the build dir first
make collection of SUBDIRS in solution generator less bizarre
run depend_command in build dir in VS generators as well
fixify target source against build tree
fix fixifying of QMAKE_SUBSTITUTES
dist target: fixify OBJECTS_DIR against output dir
fix paths of vpath-resolved files
simplify: absolute fixification ignores the base dir arguments
simplify: fileFixify for all same paths is always "."
simplify: the input and output dirs are already normalized
stop fixifying after first success
create a pwd string with a trailing slash only on demand
make uic3-generated moc files depend on mocinclude.tmp
useful location reporting for errors from QMAKE_SUBSTITUTES
clean up visual studio identification code
prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"
fix detection of relative location information
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
an empty line number does not indicate relative loc info - it may be the
result of -no-ui-lines.
instead, an empty file name does indicate it - no file name at all makes
no sense, so this means a previous messages has set it already. and we
need this additional detection, as the entire ts file may have no line
number info to base the decision on at all.
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
make -markuntranslated work without -idbased
fix conditional on shell type
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-18625
|
| | | | | |
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlViewer: Enable remote qml debugging
QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allow users to use qmlviewer for profiling.
Change-Id: I4bddabceade17260159ff5b46b35072afb204ff6
Task-number: QTBUG-18595
Reviewed-by: Christiaan Janssen
|
| |\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
qdoc: Allowed multiple values for certain metadata tags.
qdoc: modified \include to take a 2nd arg, snippet id.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Also output mainters for classes in the HTML output,
if there are maintainers listed.
|
| | | | | |
|
| | |\ \ \ |
|
| | | | | | |
|
| |\ \ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (45 commits)
Removed mobile demos from the Symbian build in demos.pro
Fixed demo subdirs for mobile examples.
qdoc: Updates to the qdoc manual.
Moved a couple of links into one list.
Doc: Work on GettingStartedQt tutorial
Added a link to the Debugging Techniques article.
qdoc: Updates to the qdoc manual.
qdoc: Added a way to exclude directories from receiving default metadata
Edited the Tutorials and Examples pages. Renamed links in index.qdoc.
Doc: Update to QStyledItemDelegate::displayText()
qdoc: Added default values to config file for DITA
Doc: Work on QAudioInput::start() functions.
Avoided the use of hard-coded file names.
Copied the declarative parser into qdoc3 to avoid dependency issues.
qdoc: Don't wrap <image> in <fig> if in an <xref>
Doc: Work on a11y docs
qdoc: Added <copyright>, <copyryear>, and <copyrholder>.
qdoc: Completed metadata handling.
Doc: Small update to QImageReader/Writer::supportedImageFomrmats()
Edited QtWebKit Guide qdoc and added external links.
...
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
