| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Ideally, these would be HTML-only macros, but the macro system doesn't
know whether macro arguments used in pure HTML are file names, so the
necessary files are not included. By using qdoc commands, we ensure
the files are copied into the generated documentation's images
directory.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed macro definition parsing that confused someone into thinking
that single backslashes would appear in macro definitions instead
of control codes.
Fixed a bug that caused only arguments in general macros to be
handled.
Enabled arguments in HTML macros.
|
| | |
|
| | |
|
| |
| |
| |
| | |
It may be worthwhile extending this to other UiQualifiedId nodes.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15670
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15516
|
| | | | |
|
| |\ \ \
| | | |/
| | |/| |
|
| | |\ \
| | | |/
| | |/| |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QTextEdit::selectAll crash from textChanged()
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Doing selectAll() after the entire block of text has been removed
will cause this crash, because we didn't check if the block we
found is valid or not.
Task-number: QTBUG-15857
Reviewed-by: Eskil
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix proxy reading from gconf so that it is only done once / session.
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes: NB#194509 - Network access from a Qt app makes dbus daemon
consume tons of cpu
Task-number: QT-4220
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: David Boddie
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Private properties start with two underscores. __property
Reviewed-by: David Boddie
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Link is now linking to the gitorious project site.
Task-number: QTBUG-15714
Reviewed-by: David Boddie
|
| | | | | |
|
| | | | | |
|
| | | |\ \
| | | | |/ |
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
rebuild configure
fix misleading uppercasing deprecation warning
Enable Phonon on Symbian by default.
Disable OpenGL on Symbian only by default instead of always
VFP type on ARM option in Linux configure script
Adding -dont-process option to Unix configure script
Synchronized configure.exe OpenGL options with Unix configure
build lrelease as part of the "libs" part.
purge vestiges of imageformat-plugins
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
don't complain about uppercasing in the function's name if the real
problem is that it's not defined at all. this is also slighly more
efficient, as we try to lowercase only as a fallback now.
Reviewed-by: joerg
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Always enable Phonon on Symbian unless it was explicitly disabled.
Reviewed-by: ossi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: ossi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Windows configuration tool uses -fpu option for VFP types.
This option is used in Symbian releases but is not supported by
Linux configure script.
Reviewed-by: ossi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This option is supported by Windows configure tool and used in Symbian releases.
Reviewed-by: ossi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Windows configure tool and Linux configure script use different options for OpenGL modules.
Windows configure tool uses -opengl-es-cm and -opengl-es-2.
Linux configure script uses -opengl <api> where <api> can be as "desktop", "es1", "es2" and are more common.
Windows configure tool is changed to understand Linux OpenGL configure options as well.
The old options are retained for compatibility but not documented any
more.
Reviewed-by: ossi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
currently it is a bootstrapped tool like moc, rcc and uic in src/tools/,
so just force it into the same group. every qt build includes the libs
part, so this will resolve the translation part's dependency.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The imageformat-plugins variable is never referenced by the .pr[io] for
building Qt. Its presence in configure.exe appears to be a vestige of
an earlier state of affairs.
As a reminder, jpeg, mng, tiff and gif can be built into QtGui or built
as plugins. The default is plugin. During configuration, this can be
overridden by adding, for example, "no-jpeg" to disable support
altogether or "jpeg" to build into QtGui.
Merge-request: 961
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | |\ \
| | | | | |/
| | | | |/|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Unify epocroot usage in createpackage and patch_capabilities scripts
|