| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Increased EPOCHEAPSIZE for qpainter benchmark
Increased EPOCHEAPSIZE for few benchmarks
Update Symbian DEF-files
Improve DEFINES crossplatform compatibility in Symbian builds.
Freezing the QtCore defs again for 4.8.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
DEFINES statements that define strings needed separate statements for
symbian-sbsv2 builds and Makefile based plaforms, as there is one extra
layer of escaping needed in Makefile builds. Improved compatibility by
making qmake remove one layer of escaping before writing the .mmp MACROs
based on DEFINES.
Note: Symbian-abld builds still do not support string DEFINES as the
toolchain simply can't handle them in .mmp files, no matter how
they are escaped.
Note2: Symbian-sbsv2 support for escaped DEFINES is not perfect either,
as bld.inf files do not like doubly escaped characters in
extension rules (e.g. double-quotation mark as part of a string).
This makes it impossible to pass such DEFINES to extra compilers.
Task-number: QTBUG-19232
Reviewed-by: Oswald Buddenhagen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits)
Fix thread safety regression of QNetworkConfigurationManager
Fix instability in QNetworkConfigurationManager autotest
Support word selection list with predictive text from splitview
Fix softkey icon positioning in S60 5.3
QDeclarativeMouseArea: block context menu events
ListViews loses items if all visible items are removed.
Make TextEdit word selection more natural.
Clear confusion between QMainWindow and QMainWindowLayout.
Fix for rounded corners bug in QMenu
Compile
QWidgetPrivate::setParent_sys might be using null pointer
Ensure the TextEdit cursor delegate is repositioned on mouse events.
Don't crash on an invalid replacementStart from an input method.
Fix incorrect hardware address on systems without getifaddrs()
Enable multisampling on Symbian if hw supports it
Fix QtCoreu.def file error
Introduce platform extension to QGraphicsSystem
Fix Symbian/WinsCW build break
Prevent crash in OpenGL engine when scaling images / pixmaps.
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
...
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qt_s60_p.h
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-18436
Reviewed-by: joerg
|
| | |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/qaccessibility/tst_qaccessibility.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make.
This would break in the case where the correct makefile was not named
`Makefile'. The included autotest demonstrates the problem.
Note that this was fixed for normal targets back in 2005
by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not
fixed for extra targets.
Reviewed-by: ossi
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
qmake vc(x)proj generator: support x64 Qt builds
qmake: remove dead code from VcxprojGenerator
qmake nmake generator: pass MAKEFLAGS to sub-make calls
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-17911
Reviewed-by: ossi
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: ossi
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Unlike other make tools nmake doesn't do this automatically.
Reviewed-by: ossi
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point).
Reviewed-by: Joerg Bornemann
|
| | | | | |
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
de-duplicate code, and on the way don't try to re-resolve project
variables of subprojects against the contents of the top level project.
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
that's where one would expect a target, after all.
affects only extra targets explicitly requesting fixification, i.e.,
nothing.
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
use the correct bases. notably, don't expect the input file in the
output dir.
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the thing is terminally broken anyway, but whatever
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-8169
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this must have been the most arcane way to generate a single dot ever
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
somewhat unlikely that this had much real-world effects ... except
eating yet more cpu.
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We needed to move the code in the init() function to the
fixTargetExt() function, which is where the variables are actually
used. The reason is that fixTargetExt() runs before init().
RevBy: Miikka Heikkinen
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This was done because trailing \ would confuse the command line
parser if the path was also quoted.
RevBy: Oswald Buddenhagen
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Oswald Buddenhagen
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This enables you to use QMAKE_xxx_yyy, where xxx is either CFLAGS,
CXXFLAGS or LFLAGS, and yyy is either APP, SHLIB or PLUGIN. It is
basically the same as the one in the UNIX generator.
RevBy: Oswald Buddenhagen
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Trust me
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Trust me
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is just a mirror of the way the UNIX generator does it. See
commits aaf189b084f52 and bdff51768dfe.
RevBy: Oswald Buddenhagen
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Oswald Buddenhagen
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Oswald Buddenhagen
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6
commit, which adds localization based on TRANSLATIONS keywords for
Raptor and abld.
In addition, since the __PRODUCT_INCLUDE__ define was creating a lot
of trouble regarding < and >, it was refactored into its own source
file, which is automatically included before every source file.
Task: QTBUG-15292
RevBy: Miikka Heikkinen
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
"!:" drive is used to indicate need to prompt user to specify
installation drive, which is obviously not happening when we do the
build time emulator deployment, so default it to "c:" drive.
Task-number: QTBUG-18134
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The undocumented special "deploy.path" variable hasn't been working
in Symbian for several releases and doesn't really make much sense
in Symbian in the first place. Also, apparently no-one has ever used
it as there has been no bug reports, so might as well remove the check
for it in Symbian.
Task-number: QTBUG-14426
Reviewed-by: Janne Koskinen
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Symbian-sbsv2 toolchain cannot handle echo suppresion character "@"
in recipes, so the character is stripped from all commands if it exists
at the beginning of the command.
Task-number: QTBUG-4767
Reviewed-by: Iain
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The filters for files in the non flat projects will start with the
base filter name and then the path to the file. So the detection of
the filter needs to be done by the start of the filter namse so that
we correctly add the compile commands for the added files.
Task-number: QTBUG-13928
Reviewed-by: Joerg Bornemann
|
| |\ \ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
