| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Previously it would not use the autogenerated def files.
RevBy: Thomas Zander
|
| |
|
|
|
|
| |
they may contain (absolute) windows paths, which need escaping now.
Reviewed-by: mauricek
|
| | |
|
| |
|
|
| |
Reviewed-by: joerg
|
| |
|
|
|
|
| |
the code assumed it anyway and would make a mess if it was wrong
Reviewed-by: joerg
|
| |
|
|
| |
Reviewed-by: joerg
|
| |
|
|
|
|
|
|
|
|
|
| |
the value of the variable in Option is only ever accessed via the
project variable, so there is no point in early fixing.
as it happens, this fixes mingw+sh generating makefiles with the wrong
separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was
read back into Option.
Reviewed-by: joerg
|
| |
|
|
| |
Reviewed-by: joerg
|
| |
|
|
| |
Reviewed-by: Thierry
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Added default countries for Mongolian and Nepali.
Updated tst_qlocale autotest.
Updated the 4.7.0 change log with my changes.
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 )
doc: Fixed many broken links.
doc: Fixed many broken links.
doc: Fixed many broken links.
qdoc: Set back to 3 cols for class list; we have a scrollbar now.
Fix build on Mac OS X and Windows.
Remove obsolete and broken qvfb skins.
Only setup ICD test data when ICD is enabled.
Doc: Fixed two diagrams and finally committed images for them.
Make sure cursorPositionChanged is emitted when doing undo/redo
Some more 4.7.0 changes
Fix cosmetic issue in designer filter edits
Doc: Adding support for IE 6, 7 and 8
doc: Updated the widgets tutorial to work without page links.
My 4.7.0 changes
Added support for es_419 locale.
Added Korean and Nynorsk locales support on Symbian.
...
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10728
Reviewed-by: Thierry
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication_s60.cpp
|
| | |\ \ |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Before this change:
target.CONFIG+=no_check_exist implies the file is a file, no way to
make an install rule for a non-existing directory.
Now, its possible to specify the type:
target.CONFIG+=no_check_exist directory
will install a directory.
target.CONFIG+=no_check_exist executable
will install an executable.
target.CONFIG+=no_check_exist data
will install a normal file.
The default case, if no type is given, like in
CONFIG+=no_check_exist
will call QFileInfo::isExecutable() to determine, if its a data file
or executable. This is the old behaviour.
Task-number: QTBUG-10624
Reviewed-by: ossi
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
|
| | | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | | | |/
| | | |
| | | |
| | | | |
Reviewed-by: ossi
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix this makefile syntax error when building Qt from root:
"makefile:60: *** target pattern contains no `%'. Stop."
Break was caused by having absolute path in $(MAKEFILE) variable, which
broke subdir targets.
Reviewed-by: Janne Koskinen
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Set edit focus to proper control in flightinfo demo
Update symbian def files for 4.7
Do not autopatch <app>_installer.pkg when self-signing
Fix pkg_prerules handling for installer packages
Fix weatherinfo and flightinfo to only request WLAN connection once
Fix 'chapter5_plugins.dll.sym contains initialized writable data'
Fix generation of stub sis files
Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks
Shadow building on Symbian fixes: part 3 - unchanged source tree
Shadow building on Symbian fixes: part 2 - populate bin dir correctly
Shadow building on Symbian fixes: part 1 - files to right place
Re-enable suppression of --export_all_vtbl for static libraries
Omit building declarative/painting benchmark if no OpenGL configured
Fix requires keyword handling in qmake in Symbian
Support device aliases in EPOCDEVICE
Update Symbian DEF files for WINSCW and EABI
Fix spurious mouse click when dismissing a native menu
Add 'runonphone' target for symbian / makefile
Double-click support for virtual cursor in Symbian
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The removed check was causing dropping of vendor info from installer
package files. No need to check for header in rawPkgPreRules as it would
never get there in the first place; it gets placed into headerRules
instead.
Reviewed-by: Shane Kearns
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Convert paths in DEPLOYMENT to the rom drive (z:)
Filter out unwanted parts of the header (dependencies)
Task-number: QTBUG-10118
Reviewed-by: Alessandro Portale
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Stop symbiancommon.obj being generated in the source directory even when
shadow building
(make has a rule to make .obj files, and quite happily makes the .obj in
the source dir when it sees it as a dependency....)
Also, correct spaces instead of tabs - this is a makefile!
Task-number: QTBUG-10432
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
First in a set of fixes for shadow building on Symbian - make sure we
generate all the files into the shadow directory, *not* the source
directory
Task-number: QTBUG-10432
Reviewed-by: Miikka Heikkinen
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Now qmake doesn't generate bld.inf etc. files for projects that fail
requires check. An error message is also printed.
Task-number: QTBUG-10698
Reviewed-by: Iain
|
| |/ /
| |
| |
| | |
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | |
| |
| |
| | |
this is relevant only for maintainers, but still.
|
| | | |
|
| | |
| |
| |
| |
| | |
the existing values are fixed-point representations of the msvc
versions, so adhere to it.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Adding the post-build step to copy the dll into bin
Reviewed-By: Thierry
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The variables QMAKE_LFLAGS_DEBUG, QMAKE_LFLAGS_RELEASE,
QMAKE_CXXFLAGS_DEBUG and QMAKE_CXXFLAGS_RELEASE are handled by .prf
files in mkspecs/features and don't need to be evaluated by generators.
Reviewed-by: ossi
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't have to evaluate QMAKE_FLAGS_CONSOLE or QMAKE_LFLAGS_WINDOWS.
These files do it for us:
mkspecs/features/win32/console.prf
mkspecs/features/win32/windows.prf
Reviewed-by: andy
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't have to evaluate QMAKE_CXX_FLAGS_WARN_ON / ..._OFF
mkspecs/features/warn_on.prf / ..._off.prf do it for us.
Reviewed-by: andy
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
bye bye QMakeProjectEnv
short-cut evaluation inside if() tests
eliminate special splitting of INCLUDEPATH and DEPENDPATH
do not env-expand cache file path
s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
s/INCPATH/INCLUDEPATH/
s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
warn about usage of deprecated variables
warn about using non-lowercased replace $$function()s
add -Wdeprecated option (on by default)
make QMakeProject::isEmpty() consider legacy mappings
document some functions' scope
fix $$size() not using function-scoped variables
doc: Fixed some qdoc errors.
qdoc: Added breadcrumbs for namespaces.
Autotest: check that we receive key events on toplevel widgets
Cocoa: key events stopped working
Update Polish translations
qdoc: Added "All namespaces" to the API Lookup box.
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qmake variables would have been exported to the command run by
$$system() and - optionally - to the command run by system().
however, this was a unix-only feature and made the kernel barf
at the huge environment on older linuxes.
as we don't like platform-specific hacks which are unreliable,
in particular when a workaround exists (the commands execute
shell code after all, so one can inject arbitrary env variables),
just blow it away - it was undocumented, after all.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this is consistent with the top-level scope evaluation.
if() is undocumented and the old behavior would be pretty unexpected for
anyone, so i feel free to break compatibility.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
it wouldn't work as expected anyway, as the splitting rule (using the
semicolon in addition to whitespace) applied only to the string literal
from the pro file, but not any expanded [environment] variables, etc.
(i.e., where it might make any sense). so just drop it, as it would
considerably complicate later optimizations. it wasn't documented
anyway ...
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
it makes totally no sense - if one wanted to expand env variables,
one would let the shell do it.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
planning to kill off that (mis-)feature at some point.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | |/ /
| | |
| | |
| | |
| | | |
Reviewed-by: Janne Anttila
Reviewed-by: joerg
|
| |/ /
| |
| |
| |
| |
| |
| | |
Qt generic slash separator must be supported also in platforms
that do not have that as platform specific separator.
Reviewed-by: Thomas Zander
|
| | |
| |
| |
| | |
Reviewed-by: Martin Petersson
|
