| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Make sure we always use the absolute path to the pro file so it will
just work from either source or build dir.
This fixes the usecase where qmake generated a relative path starting
with '..'
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
The code generated would always create the Makefile in the sourcedir, even
if you had src!=build
|
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
This is so that Symbian can have custom prefixes and extensions.
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
This means using elf2e32 instead of elftran, and eliminates the need
for generating exports manually.
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
The first enables you to use a prefix in front of the library. It is
by default enabled for all platforms which previously used "lib", and
on Symbian it is set to the empty string.
The second variable enables Symbian style linking, where you link
to a stub .lib file, but the actual runtime library is .dll.
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
This makes configure a lot faster.
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Avoid the use of cmd.exe syntax through the use of Option::shellPath
instead of isForSymbian() in qmake.
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Based on a patch by Simon Hausmann.
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
Make destructor virtual.
Optimized QLocale to access system locale on demand.
Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce
Compile fix on keypad-navigation systems
Force qt-zlib to be used for host system when cross compiling.
qmake: fix to create proper install target in Makefile at first run
compile fix for Windows
Fixed focus handling when Qt is embedded into Cocoa app.
Do not beep on Mac when pressing some keys.
Do not deliver the same key event multiple times in Cocoa.
Implement Idle-priority threads for Linux.
Improved qt_x11_wait_for_window_manager
Doc: document QElapsedTimer
Added missing "const" for mac.
qdoc3: Fixed some ifdef typos and removed some whitespace.
Manual test for QTBUG-8933.
Cocoa: minisplitter has only 1px wide grab area
"Strictly" Fullscreen Application in Mac OS
Bugfix the Symbian implementation
Add QDateTime::currentDateTimeUtc and QDateTime::currentMsecsSinceEpoch
...
|
| | |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Previously when qmake was executed the first time, or when no
previously compiled binary target was available for some reason,
qmake just created an empty install target in the Makefile.
So in fact for a target to be installed properly you needed to run
something like "qmake && make && qmake && make install".
This should now be fixed with this patch.
Reviewed-by: Marius Storm-Olsen
Task-number:QTBUG-5558
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / /
|/| | | | | | | | | | | | | /
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | |
| | | | | | | | | | | | | | |
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
change b37ac454832a23c17418f5ebca8928b63fe02289 changed sis file names
from qt_debug-armv5.sis to qt.sis
This updates the runonphone make target to the new sis file name
Reviewed-by: axis
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
different approach to fixing "the other" aliasing issue
fix aliasing issue in node_construct()
detach in fewer cases, remove redundant calculation
SSL: Fix memleak related to local certificate
Improve keyboard layout detection on X11
Compile on ARM with -Werror -Wold-style-cast
Use the vista-style native dialog for QFileDialog::getExistingDirectory
Apply the stdset attribute for resource properties
doc: Completed sentence about HideNameFilterDetails
Doc fix in QLocale
Doc for for QGestureRecognizer::create.
Fix broken setCollectionFile (creating multiple models instead reusing)
Enable the fast paths when converting to Rgb565
qdoc: ifdefed out all the debug code.
Add missing QtScript API shims
Further fix license whitespace.
Remove NetworkManager test-bed application.
Remove configure test for NetworkManager.
Fix QDir::entryList regression
Add DEFINES to mingw32/windres.exe command line.
...
|
| | | |_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
qmake didn't add $DEFINES to the windres.exe command line, while it was
added to the rc.exe command line.
Task-number: QTBUG-7773
Reviewed-by: Marius Storm-Olsen
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| / / / / / / / / / / /
| |/ / / / / / / / / / /
| | | | | | | | | | | | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Added support for the following RSS_RULES variables to improve control
over placement of user defined rules inside application registration
resource file:
RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO
RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO
RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item
in the service_list of APP_REGISTRATION_INFO
RSS_RULES.file_ownership_list - Rule placed inside a
FILE_OWNERSHIP_INFO item in the file_ownership_list
of APP_REGISTRATION_INFO
RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the
datatype_list of APP_REGISTRATION_INFO
Task-number: QT-3083
Reviewed-by: Janne Anttila
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QHostInfo: Forgot to free some stuff on application exit.
Readd a line that got removed by accident in previous change
Ensure that a library path with a space in it gets quoted on Windows
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
A line got removed by accident in the change
f3af7b746221cb44899f3e433659791f75255f21, this patch readds it back.
Reviewed-by: TrustMe
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
This was not happening when -L and -l was used and the path specified
with -L was quoted. It would lose the quotes when combining it to get
the full path for the library it found.
Task-number: QTBUG-2433
Reviewed-by: Marius Storm-Olsen
|
| | |/ / / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Qt Creator detects Qt versions by running qmake. This fails if no
MinGw setup is in the path as is usually the case when starting it
from the menu. Make it possible to run qmake without setup. Strip
executable.
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Reviewed-by: mariusSO <qt-info@nokia.com>
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
the mode is a big hack, and consequently needs hacks to get started
as well ...
Reviewed-by: mariusSO
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-by: mariusSO
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
inspired by the pbx generator.
currently this has no effect, as all generators build their own
fallbacks anyway.
Reviewed-by: mariusSO
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
the generators change the value of QMAKE_QMAKE, so it is unwise to
"redirect" it to a hidden builtin which is reset each time.
in particular, this fixes qmake generating makefiles without an absolute
path to qmake itself - the initial quoting of the filename will make the
variable "real", so contains() will start working for it.
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
fix "configure -fast" on Windows for other maketools than nmake
Get qmake to add pdb files to install target in debug configuration.
add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
give symbian an own platform mode
deprecate -win32/-unix/-macx which set both host and target mode
decouple host platform mode from target platform mode
factor out applyHostMode()
make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
use QDir::separator() instead of Option::dir_sep where appropriate
simplify string ops
sanitize evaluation of OS scopes
instead of hard-coding recursion for symbian, add it to the specs
add possibility to request project recursion from within a pro file
fix ts-assistant target
use QList::reserve() as appropriate
optimize appending of (empty) lists to (empty) lists
suppress pointer aliasing warnings
Fix compilation with namespace.
Assistant: Make ~AbstractHelpViewer() virtual.
Prepare German translations for 4.7 (except Quick).
...
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Conflicts:
configure.exe
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Merge-request: 2105
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
... instead of using the gross isForSymbian() magic
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
derive the host mode from the generator - this doesn't work *too* well
if the mode is different from the real host platform, so it's only for
testing.
get the target platform mode from the qmakespec, falling back to the
host platform mode.
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
more preparation work for delayed mode determination ...
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
this will allow setting their actual value depending on a delayed
determination of the platform.
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
in these cases, the separator depends on the *real* host platform, not
on the one that will host the build.
there are many more cases like that, but that's for (much) later ...
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
this is marginally behavior-incompatible in that adding the name of an
OS scope to CONFIG will not make it true any longer.
the cleaned up semantics (besides having merit by themselves) will
enable optimizations.
Reviewed-by: mariusSO
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Reviewed-by: mariusSO
|
| | | |_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
this is the same as specifying -r on the command line, but it can be set
in pro and spec files for cases where no recursion would plain not work.
the implementation is via a new option() instruction which at some point
will be used to set other "modes of operation" as well. for now, only
the "recursive" option is recognized.
Reviewed-by: mariusSO
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / /
|/| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits)
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Fix for cetest.
Speed up compilation of this test with MSVC.
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
Crash in QGraphicsScenePrivate::setFocusItemHelper
Pass the right arguments to QApplication in GraphicsView benchmark.
Improvements to itemview keypad navigation in S60.
Revert changes made in scroll_sys().
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Set the roleNames of proxy models to the roleNames of the source model.
Add benchmarks for accessing meta-object properties via QScriptValue
...
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
It is necessary to specify this variable conditionally sometimes,
which requires use of MMP_RULES, so allowed overriding it without
warning.
Task-number: QT-2909
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| | | / / / / / / / / /
| | |/ / / / / / / / /
| |/| | | | | | | | |
| | | | | | | | | | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QFileInfo::isDir() will not return correct value if path doesn't exist
like it doesn't in case of clean builds. Turned the check around
and used isFile() instead. If a file is given as origPath, it is
assumed to exist, because it was explicitly given with HEADERS variable
and qmake will give warning if nonexisted file is given there.
Reviewed-by: Janne Koskinen
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
1) FLMs should not have more than one phase dependency -> removed extra
dependencies, leaving only what is actually necessary.
2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete
3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm
so that unrelated components can continue building instead of
halting the whole build at EXPORT phase.
4) Added .export to qmake_extra_pre_targetdep interface so that it is
actually executed in EXPORT phase where it should be.
Task-number: QTBUG-8513
Reviewed-by: Janne Koskinen
|
