| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-By: Trust Me
|
| |
|
|
|
|
|
|
|
| |
The missing flush could result in script bindings appearing after the
closing brace of an object.
Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from e01219b77b1e889e70437635905d7ff820568e23)
|
| |
|
|
|
|
|
| |
Task-number: QTCREATORBUG-6625
Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from 409aecbe1e30aa1319ea72bf830c405827e13d21)
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix stack overwrite in QDBusDemarshaller
Qt Linguist: Fix crashes
fixed error generating wrong introspection string in header output file
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Fix crash when select translation after close and open file.
This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20
Merge-request: 1480
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
When using dbus introspection files with CRLF encoding the CR is not
handled and results into a CR code at a wrong location in the output file
Task-number: QTBUG-17634
Merge-request: 1478
Reviewed-by: thiago
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| | | |
|
| |\ \ |
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Sequential reading not supported.
DeclarativeDebugServer: Instantiate QPluginLoader on heap
Fix failing unit tests.
qmlplugindump: Fix dumping empty names for generated QMetaObjects.
Fix compile with -qtnamespace
Properly protect access to pixmap reader thread with mutex
Move tga support from Qt3d to Qt.
Move tga support from Qt3d to Qt.
Properly protect access to pixmap reader thread with mutex
qmlplugindump: Add flush to fix output redirection on windows.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTCREATORBUG-5825
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits)
Add note to declarative calculator example
Help: Add \depends to all declarative examples & demos
Declarative Examples: Fall back to local qmlapplicationviewer.
Fix qdoc output for <dependency> tag.
Change installation location of examples.
Add Symbian platform notes.
Fix "make install" for declarative examples
Add C++11 support and QThreadLocalStorage changes to docs.
Update the license in the qmlapplicationviewer.
Examples: Add Copright headers, Remove stray file.
Compile fix.
Fix use of qmlapplicationviewer.
Doc: Create relative pathes in Manifest files.
Doc: Copy manifest files to the places where Creator expects them.
qdoc3: qdoc supports \depends in 4.8
qdoc3: qdoc supports \depends in 4.8
Update qrc files.
Update qmlapplicationviewer template,
cppextensions/qgraphicslayout example corrections
demos/declarative/snake example corrections
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also prepend relative path if required.
Reviewed-By: trustme
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is what you write...
/*!
\example designer/calculatorbuilder
\depends qmlapplicationviewer
\title Calculator Builder Example
This is what you get...
<example name="Calculator Builder Example"
docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html"
projectPath="designer/calculatorbuilder/calculatorbuilder.pro"
imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png">
<description><![CDATA[The Calculator Builder example shows how to create a user interface from
a Qt Designer form at run-time, using the QUiLoader class.]]></description>
<tags>calculator,builder</tags>
<fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen>
<dependency>$QTDIR/examples/qmlapplicationviewer</dependency>
</example>
Task-number: QTBUG-22838
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is what you write...
/*!
\example designer/calculatorbuilder
\depends examples/qmlapplicationviewer
\title Calculator Builder Example
This is what you get...
<example name="Calculator Builder Example"
docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html"
projectPath="designer/calculatorbuilder/calculatorbuilder.pro"
imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png">
<description><![CDATA[The Calculator Builder example shows how to create a user interface from
a Qt Designer form at run-time, using the QUiLoader class.]]></description>
<tags>calculator,builder</tags>
<fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen>
<depends>../../examples/qmlapplicationviewer</depends>
</example>
Task-number: QTBUG-22838
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: trustme
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conditions: shadow build & non-prefix build
Reviewed-by: Casper van Donderen
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* MessageEditor keeps deleted editor as m_selectionHolder.
QOjbect::destroyed() SIGNAL doesn't fit to fix this problem
due to destruction order problem.
Merge-request: 1466
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Update the supported platforms page.
Increase qdoc3 stack size when using MSVC to 4M.
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When running 'make docs' on Win7 with MSVC2010 64bit debug qdoc will
crash from a stack overflow. The stack overflow occurs when sorting the
list of nodes in the internal qdoc tree.
This patch circumvents the stack overflow crash by increasing the stack
size from the standard 1M to 4M.
Reviewed-by: Friedemann Kleint
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Update supported platforms and remove commercial page.
qdoc3: Replace %REPLACEME% with the correct path
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-22427
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6)
- Add detection of g++ version and 64bit to configure.
Reviewed-by: mariusSO
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Qt Designer: Fix static linking on Mac.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add a comment in shared.pri explaining the problem.
See also e7762b60d519c9ae4b47f6c4ceece584408247ea
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-22542
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \ \
| |/ / / / |
|
| | | | | | |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QWS_ALPHA_CURSOR was only mentioned in qfeatures.txt and corresponding
QT_NO_QWS_ALPHA_CURSOR was not used anywhere in Qt code.
Task-number: QTBUG-20337
Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
runonphone was dropping leading zeros after the decimal point in its
timestamp formating. For example [123.000456789] was printed as
[123.456789], which is quite a different number.
The formatting now pads the nanoseconds component with leading zeros to
9 characters. Timestamps are now always displayed with a 9 character
nanoseconds component, with leading and trailing zeros as appropriate.
For example:
[1897.070556640] [Qt Message] QEglContext::swapBuffers
Reviewed-by: Shane Kearns
|
| | |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If runonphone is executed without specifying the debug agent, then
it will attempt to autodetect it by sending a CODA ping to the USB
port.
If there is a reply within 1 second, then CODA mode is used.
If not, then TRK mode is used.
TRK drops unrecognised messages, so the CODA ping is ignored and
initialisation starts normally when the TRK ping is sent.
Autodetect can be skipped by using the --coda or --trk arguments on
the command line to force use of a specific debug agent.
Reviewed-By: mread
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix broken qglthreads autotest build on Solaris.
Don't store the alignment attribute for spacers
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
And for QLayoutWidget as it is not allowed and will create
a code which doesn't compile
Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-21575
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits)
runonphone: Include USB serial ports on OS X for CODA, too
runonphone: Implement traceswitch support for coda
Fix missing clean up stack panic for a new thread in Symbian
Regression in QS60Style when drawing webview scrollbars
Cleanup qwidget_s60.cpp
Fix panic when global QSettings instance needs flusing at app exit
Fix uninitialised variable in temporary files
More accurately determine bearer type for symbian GPRS/3G
Add documentation for Symbian QSettings locations and security
Update QDesktopServices openUrl() documentation on Symbian OS
Mark binaries as SMPSAFE in Symbian
Fix "sbs -c tools2 --what" output for Qt.
Update environment.prf
QS60Style: Make spinboxes and lineedits slightly taller
runonphone: Add a missing space between a message and the file name
runonphone: Allow overriding the temporary sis file name
Fix QIcon auto-tests for Symbian
Add a cast to moc cpp generator to remove armcc warnings
Fix qt.conf for Symbian to use $${EPOCROOT}
Remove few unused variables.
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The actual devices are already detected in serenum_unix.cpp, but
when used with CODA, the eligible /dev entries apparently need
to be listed here, too.
Reviewed-By: Shane Kearns
Merge-Request: 1373
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The traceswitch application redirects debug messages to the USB
port. This was supported by the TRK backend but not by the CODA
backend.
1. CODA backend now recognises mux channel 2 as valid
2. new TextTraceHandler class to attach to channel 2 and decode
trace packets / print them to stdout
3. CODA signal handler creates a TextTraceHandler & destroys it
on shutdown
Reviewed-By: Miikka Heikkinen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2670
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 1300
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |\ \ \ \ \ \
| |_|/ / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
StrictlyEnforceRange with snapOneItem/Row and header behavior change
Release font engine refcount when done using it in QTextEngine
Migrate addMarkUp function to QChar.
update the proxy info before session is opened in QNAM by Aapo Makela
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
Fix assert error on Windows with a negative char.
Doc: Fixed the example of an encoded URL in the class description.
Added an additional check to workaround an issue on Windows.
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Martin Smith
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Denis Dzyubenko
Fixes: QTBUG-20228
|
| |\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
