| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
qmake: fix writing of incremental linker option for vcxproj files
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (35 commits)
runonphone timestamps nanosecond formating set to 9 chars, 0 padded
Put Qt translation files to rom on Symbian.
Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
Converting from double to qreal in gui
Fix XML schema validation failure.
Fix construction races in QtNetwork
Removing accidental use of double instead of qreal from QLine
Fix incorrect QFileInfo permissions on windows
Converting accidental use of doubles to qreal in declarative
Copy and Cut are not available for some QML editors
Ignore CcpuCan calls if input context is being destroyed
Remove one local variable from QCoeFepInputContext
Symbian: Fix native dialog with splitscreen VKB focus loss issue
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
runonphone - Implement CODA autodetection
Symbian: Parse ts filenames case-insensitively for localize_deployment
Do not crash in copy() of pixmaps without an underlying bitmap
QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8
symbian - document behaviour of QFile::handle()
...
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A lot of platform applications have all-lowercase translation files
due to file naming policies. This makes no difference for runtime
translation, so removed unnecessary case sensitivity when parsing ts
filenames for localization deployment.
Task-number: QT-5305
Reviewed-by: Sami Merila
|
| | |\ \ |
|
| | |_|/
|/| |
| | |
| | |
| | | |
Task-number: QTBUG-21965
Reviewed-by: joerg
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qmake generates .gpj project files for INTEGRITY.
Calls to moc on headers or code that do not produce actual output cause
a Note to be generated. This is considered as an error during build by
the Green Hills gbuild build tool.
-nn can be added to not generate that note when no output is generated.
This was already done for headers in util/integrity/qt.bod, but it was
not there yet for .cpp files.
Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | |
|
| |\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits)
runonphone: Include USB serial ports on OS X for CODA, too
runonphone: Implement traceswitch support for coda
Fix missing clean up stack panic for a new thread in Symbian
Regression in QS60Style when drawing webview scrollbars
Cleanup qwidget_s60.cpp
Fix panic when global QSettings instance needs flusing at app exit
Fix uninitialised variable in temporary files
More accurately determine bearer type for symbian GPRS/3G
Add documentation for Symbian QSettings locations and security
Update QDesktopServices openUrl() documentation on Symbian OS
Mark binaries as SMPSAFE in Symbian
Fix "sbs -c tools2 --what" output for Qt.
Update environment.prf
QS60Style: Make spinboxes and lineedits slightly taller
runonphone: Add a missing space between a message and the file name
runonphone: Allow overriding the temporary sis file name
Fix QIcon auto-tests for Symbian
Add a cast to moc cpp generator to remove armcc warnings
Fix qt.conf for Symbian to use $${EPOCROOT}
Remove few unused variables.
...
|
| | |
| |
| |
| |
| |
| |
| | |
The languageAttribute and underscoreChar variables were not used
in SymbianCommonGenerator::parseTsContent function, so removed them.
Reviewed-by: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To better support various localization tools, added an alternate way
to detect application caption and package name translations in .ts
files. Now in addition to specific source text the id attribute of
the message element can be used to identify interesting translations.
The ids qmake is looking for are:
qtn_short_caption_<appname>
qtn_long_caption_<appname>
qtn_package_name_<appname>
qtn_smart_installer_package_name_<appname>
Task-number: QT-5247
Reviewed-by: Sami Merila
|
| | |\ |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
find qt.conf more reliably
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
a qmake invoked with a relative path would not find qt.conf, because it
already changed CWD, which would confuse our copy of
QCoreApplication::applicationFilePath() (see also QTBUG-21381).
we already have the absolute path to the qmake executable in
Option::qmake_abslocation, so just use it.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-20419
Reviewed-by: ossi
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian system date format parsing.
Fix QXmlSimpleReader auto test failer
Fix pointer event mapping when windows are fixed to native orientation
Fix incorrect Symbian version check.
Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
Improved support for shadow builds in Symbian.
Fix def file paths for Symbian shadow builds
Giving QUuid::createUuid() more entropy on Symbian
Enable running of XQuery test suite
QXmlSimpleReader handle external entity reference file over 1k
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It is now possible to make shadow builds in Symbian.
Note that any relative host side paths specified via BLD_INF_RULES,
MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted
to point to build directory.
Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe
|
| | |
| |
| |
| |
| | |
Merge-request: 2619
Reviewed-by: ossi
|
| |/
|
|
|
| |
Merge-request: 1299
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Symbian, when parsing .ts files for deployment localization, qmake
would break if there was any translation using lengthvariants inside
QtApplicationCaptions context. Technically this is legal though
QtApplicationCaptions context is only meant for application captions
and we don't support lenghtvariants for the actual captions themselves.
Changed parsing so that any child elements on translations are simply
skipped instead of causing parsing errors.
Task-number: QT-5169
Reviewed-by: Guoqing Zhang
|
| | |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | |
| |
| |
| | |
this was just a merge artifact
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
trivial: fix typo in comment
changelog
docu update for QNX 6.5
get rid of anacronysm
massive improvements for the QNX screen driver
massive improvements for the QNX mouse driver
massive improvements for the QNX keyboard driver
disable the Embedded Linux data directory permissions check for QNX
skip two subtests that are known to fail on QNX
implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
implement POSIX IPC based QSystemSemaphore and QSharedMemory backends
add a configure-time check for an IPC support
make QProcess really work on QNX
make the kernel attempt to emulate an instruction with a misaligned access
use RoundRobin scheduler by default on QNX
a major refactoring of the mkspecs tree for QNX
buildfix for qmake
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Adding debug output for not supported gl features
Compile fix in network for ios
Make it possible to compile in a screen plugin name in QWS
Don't redefine EGL defines
Compile fixes in corelib for ios
Export IPHONEOS_DEPLOYMENT_TARGET from qmake
Adding arm armv6 and armv7 as valid archs for mac builds
reset certain global variables on deletion
Made tst_QWidget::repaintWhenChildDeleted() pass.
|
| | |/ /
| | |
| | |
| | | |
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
it's more natural to look into the build dir before the source dir, and
it's what the qmake-generated makefiles mean when re-invoking qmake.
specifically, this works around the problem that relative paths with
excess ".."s pointing below the root are happily ignored and thus truly
bizarre makespec paths may be constructed by the qmake re-invocations if
the source dir is less nested than the build dir.
Task-number: QTBUG-9817
Reviewed-by: mariusSO
|
