| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Adds mkspecs and a qmake generator for Green Hills .gpj files
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| |
| |
| |
| | |
Reviewed by our Anttis
|
| |
| |
| |
| |
| |
| |
| |
| | |
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:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
using WarnDeprecated instead of WarnParser is a bit backwards, but we
need something which is on by default and i don't feel like introducing
a second parser warning mode for that.
Reviewed-by: mariusSO
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: mariusSO
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
previously, features specified with an absolute path would not be
covered by the multiple inclusion guard, unlike the one specified just
by a name.
this is of theoretical value only, as nobody specifies features via
absolute path anyway ...
Reviewed-by: mariusSO
|
|\ \ \ \ \
| |/ / / /
| | | | /
| |_|_|/
|/| | |
| | | | |
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Mif file cleaning was incorrectly done at distclean phase.
Task-number: QTBUG-16893
Reviewed-by: axis
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
There is no fundamental reason to not have dash or dot in binary names
in Symbian, so do not replace them with underscore.
One thing that doesn't work with a dot in the filename is launching
an application via resources, so automatic resource generation is
suppressed for applications that have a dot in filename portion of
the TARGET value.
Task-number: QTBUG-16888
Reviewed-by: axis
|
|\ \ \ \
| |/ / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Proper fixed targets was not used to generate the dependency for
QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen
before actual linking.
Task-number: QTBUG-16881
Reviewed-by: axis
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits)
Avoid possible font name collisions on fbserv
Update of Czech translation for Qt 4.7-stable
Fix crash in QtScript/JSC stack allocator on Symbian
HTTP: fix digest authentication
Fix loop count in animanted gifs sometimes being incorrect
Fixed UTF-8 application names in device application menu in Symbian
Validate arguments to QDBusConnection::connect
make the test a bit stricter
ignore the warning from auto-detach in destructor
get rid of extra calls to handle()
simplify QSharedMemory::detach()
avoid extra calculations
fix error reporting on detach()
fix error reporting
Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
Fix to pen state handling in OpenVG paint engine.
BorderImage fails for .sci source containing a URL
positionViewAtIndex can fail when positioned near end of list.
Revert "Fix loaded() signal to be emitted only once"
Revert "don't include harfbuzz where we don't use it"
...
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
CHARACTER_SET UTF8 statement was missing from generated .rss file,
causing localized application names containing UTF-8 characters
to be rendered incorrectly.
Task-number: QT-4476
Reviewed-by: axis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QMAKE_POST_LINK value handling now uses the same automatic replacements
as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling.
In practice this means that it is now possible to use $$QMAKE_COPY and
friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and
that any backslashes in the value are assumed to be path separators and
will be converted to forward slashes.
Task-number: QTBUG-16753
Reviewed-by: Janne Koskinen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Toolcheck can cause generic clean fail (i.e. "make clean" or
"make debug-clean") for e.g. environments where Carbide command
line tools have not been installed, because sbsv2 toolchain does a
check for all tools related to target platforms, even though they are
not needed for actual cleaning.
Task-number: QTBUG-16691
Reviewed-by: Janne Koskinen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
querying $$DIR_SEPARATOR (possibly indirectly via $$QMAKE_DIR_SEP) may
happen before querying any os scopes, so better make it initialize the
host mode explicitly.
loading features theoretically needs an initialized dir_sep as well (to
detect relative paths), so take care of that as well.
Task-number: QTBUG-10633
Reviewed-by: mariusSO
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
split_value_list() interprets them, too, but this is useless if the
higher layer doesn't and is thus confused by unmatched quotes.
note the top-level parsing layer doesn't support escapes, but that's ok,
because there function calls are "isolated" by non-escapable parenthesis
counting (and the RHS of assignments is not subject to any parsing at
all).
Reviewed-by: mariusSO
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
unify the code paths for last and intermediate arguments.
as a side effect, this should be somewhat more efficient.
Reviewed-by: mariusSO
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
cut down code duplication
Reviewed-by: mariusSO
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
the last argument would be unquoted, but only if currently in a quote.
that means that an invalid construct like "foo"" would be reduced to
another invalid construct foo". this doesn't sound overly useful ...
Reviewed-by: mariusSO
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
"foo 'bar "whee"' baz" would be actually treated like nested quotes.
of course, this makes utterly no sense, as both the layers below and
above couldn't do anything with that. and it would break actually useful
things like quoting an apostrophe.
Reviewed-by: mariusSO
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Move pkg-config related methods from unix generator to base class
so they can be used by other generators too.
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |/ /
|/| |
| | |
| | |
| | | |
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make it possible to freeze def files via makefile targets.
Task-number: QTBUG-13769
Reviewed-by: Janne Koskinen
|
|\ \ \
| |/ /
| | /
| |/
|/|
| | |
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
No checking for the end of xml file was done in while loop looking for
TS element.
Task-number: QTBUG-16261
Reviewed-by: Janne Koskinen
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration
* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits)
Fix warnings, whitespace cleanup
Don't rely on uninitialized data
Doc: Fixing typo
Doc: Fixing typo
Skip failing tests
Use effective user id instead of getlogin
Fix compile error in tst_qfileinfo on Mac/Linux
Fix tst_QFileInfo owner() & group() failure on Windows.
Fix tst_QFileInfo::canonicalFilePath failure on Windows
Fix QDir::relativeFilePath
Fix spelling in comments
Add missing license header to test case
Define _WIN32_WINNT before any includes
New attempt at fixing compilation failure
Removing unused duplicate definitions
No symbolic links in Windows CE
Set minimum target Windows version to 2000
More missing includes
Add missing include
Fix compile error
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration
* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (218 commits)
Fix compile error in tst_qfileinfo on Mac/Linux
Fix tst_QFileInfo owner() & group() failure on Windows.
Fix tst_QFileInfo::canonicalFilePath failure on Windows
Fix QDir::relativeFilePath
Fix spelling in comments
Add missing license header to test case
Define _WIN32_WINNT before any includes
New attempt at fixing compilation failure
Removing unused duplicate definitions
No symbolic links in Windows CE
Set minimum target Windows version to 2000
More missing includes
Add missing include
Fix compile error
Update def files
Fix tst_QFile::caseSensitivity test on Mac
Fix typo in QFile test
Add test generated files to .gitignore
Fix compile error for qdir autotest on symbian3
QtDeclarative: make autotests compile on symbian
...
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master's version of conflicting def files picked.
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| | | | | | |
|