| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8562
Reviewed-by: ossi
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
|
| | | |
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-8562
Reviewed-by: ossi
|
|/ |
|
|
|
|
|
|
| |
This version of configure.exe was compiled with MSVC 9.0.
Reviewed-by: Miikka Heikkinen
|
|
|
|
| |
Reviewed-By: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix bug where all target types, including apps, plugins and static
libraries were getting DEFFILE statements - now it's just libraries that
get it.
Fix bug where duplicate DEFFILE blocks were being added to projects that
manually specified their own DEFFILE - this now tests for the qmake
variable "defBlock" being set, and doesn't add additional DEFFILE
statements if it is.
NOTE: This means that adding DEFFILE statements to MMP_RULES
manually should be done by creating a variable called defBlock, and
adding that to the MMP_RULES (ie. MMP_RULES += defBlock)
Fix bug in configure.exe, where using -nokia-developer for Windows builds
would warn about Symbian DEF file usage (or lack thereof)
Reviewed-by: Janne Koskinen
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
|
| |
RVCT2.2 build 686 crashes when compiling the drawhelpers with
VFPv2 enabled. Until compiler workaround found, back out the
change.
This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37.
Conflicts:
configure.exe
|
|
|
|
|
|
|
|
| |
Move SYMBIAN_DEFFILES definition in the dictionary into the Symbian
specific section of configure
Task-number: QTBUG-6556
Reviewed-by: Simon Hausmann
|
|
|
|
| |
Reviewed-by: Aleksandar Sasha Babic
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to
see if DEF files were enabled, when setting the DEF file path
Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was
defined when testing for its value, due to incorrect use of
QMap::operator[]
Tidy up configure.exe help for new def files option
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Provide configure flag to enable/disable the use of DEF files on Symbian.
A useful side-effect was that it cleaned up how we control DEF files from
qbase.pri and in WebKit.
-nokia-developer still disables DEF files, as it triggers the autotest
exports, which are not frozen into the DEF files.
Disabling DEF files means that there is no BC with previously released
versions of Qt, so this should only be used for development purposes.
.pro files can specify custom locations for DEF files by setting
defFilePath.
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
| |
This avoids two sets of --fpu flags being passed on the compiler command
line, so we don't have to worry about which takes precedence (especially
since it varies between RVCT and GCC).
Putting ARMFPU in the MMP file means that the toolchain will replace its
default option with the one we specify instead.
Reviewed-by: Aleksandar Sasha Babic
|
|\
| |
| |
| |
| | |
Conflicts:
configure.exe
|
| |
| |
| |
| |
| |
| | |
Allow better control over audio backend used.
Reviewed-by:Justin McPherson
|
| |
| |
| |
| | |
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| | |
there were several changes made to configure.exe recently, this commit
makes sure we have rebuilt the binary after all the changes have been
made.
Reviewed-by: Thiago Macieira
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
before, when configured with -openssl-linked, configure.exe hang,
because of the following:
We were checking for XQMAKESPEC via something like
'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC
value to the dictionary. Later (line 3030), we checked whether
XQMAKESPEC was set (which was now true), and we used the value although
it was empty.
Reviewed-by: Thiago Macieira
Reviewed-by: Denis Dzyubenko
|
|
|
|
| |
Reviewed-by: Warwick Allison
|
|
|
|
| |
Reviewed-By: con
|
|
|
|
|
|
| |
Rebuilt using VS2008.
Reviewed-By: Alessandro Portale
|
|
|
|
| |
Suggested by Lars, OK'd by Jason, Kristian and Shane.
|
|
|
|
| |
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
| |
version for development.
This used to work before 4.5.1
Task-number:Qt-704
Reviewed-by:thiago
|
|
|
|
| |
Bring it up-to-date with commit 950f80620b56e9ed277240dc16087f3e4b53cc4a.
|
|
|
|
|
|
|
|
|
|
|
| |
The makefile written for calling the Symbian build tools is for GNU make
not nmake, so print an accurate message when -xplatform is
symbian-<whatever>
We still don't make the correct recommendation for the confclean target
but that doesn't work anyway (see QTBUG-4536)
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks
compiler supplied with Symbian/S60 releases does not contain enough
support to build the Qt host tools in a Unicode version, and ANSI
support has been removed in 4.6.
Alternative mkspecs are win32-g++, requiring mingw tools to be installed,
or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express
edition is fine)
The mwc makefile for qmake was already removed, so this just removes the
remaining support.
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-By: Jason Barron
Reviewed-By: Alessandro Portale
Summary:
QT_NO_CURSOR is now not defined for symbian builds
Existing QCursor APIs are all supported
New public API, QApplication::setNavigationMode, to allow the navigation
mode to be set. I.E. on an S60 3.2 phone, some applications will want a
virtual mouse cursor (web browser), while others are designed for keypad
navigation.
Symbian HAL is used for detecting input capabilities.
Fix DND, code cleanup & comment
QCursor visibility now uses a refcount, and is called from DND and the
setNavigationMode so they are both simpler and don't interfere with each
other.
QApplication::setNavigationMode
New public API for configuring cursor/keypad navi style.
This links in with ongoing work on the 4-way keypad navi branch, but
2-way and 4-way modes both act as 2-way mode until that is integrated
Some of the demos/examples have cursor switched on (those that were not
usable with keypad)
Virtual mouse support for non touch, non mouse phones (tested on N78)
add *.d and .metadata (carbide debug file / workspace dir) to .gitignore
System pointers are unavailable when using sprite workaround, so the
system cursor shapes are compiled into qtgui as resources.
MAC port does this also for shapes that aren't standard on the MAC.
Refactor Drag'n'Drop to use QCursor
Add test case to check all system cursor shapes
Simply a mainwindow containing a label widget for each cursor shape,
with the cursor property set appropriately
QCursor(QBitmap,QBitmap) supported
Fixed problem with the image & mask being inverted when using the
QCursor constructor that takes two mono bitmaps.
add .make.cache files to .gitignore
Correct implementation of QApplication::setOverrideCursor
QApplication::restoreOverrideCursor and QApplication::setOverrideCursor
are now working correctly on Symbian platform.
Performance will be slower compared with other platforms, because the
Symbian window server has a cursor associated with each native window.
Add test case for custom cursors
Create a pixmap cursor and associate it with a widget.
No changes to production code, since test passed 1st time ;)
Add manual test for QCursor
Make cursor independent of construction order
Updated to work around window server issue where contruction order
affects what cursor is displayed in child windows.
Also changed to effectiveWinId following review comments
Also fixed a problem which would make qcursor not link if configured
with QT_NO_CURSOR
Moved some multiply declared extern functions from cpp to _p.h files
Implemented Symbian versions of the cursor functions.
Merged in work I'd done based on tower.
Fill in bits of stub functions based on windows port
Removed QT_NO_CURSOR from list of config options forced on symbian
Recompiled configure.exe
Added stub functions for the missing functions in s60 port
|
|
|
|
| |
This binary was built with MSVC2008 and the /MT option.
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Includes:
9b532a999944c70c2e8f57d9156c1887867ad9f1 - qtlibinfix
bb8e25a5074a378d5003577fefbeabb1de846a81 - cetest fix
5ea86cfac34f65b2321ceeeb651e4e7099bf59a0 - QT_WA removal
349997b5c4167b07d0bdc55beff175b39f3abe75 - spelling fix
bae8bc5d23946036b2c1079fc6f1b3bceeaa19ca - QT_CONFIG+=private_tests
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| |/
| |
| |
| |
| | |
Fixes the no qconfig.h output issue in main
Reviewed by: trustme
|
| |
| |
| |
| |
| |
| | |
Task-number: 254451
Reviewed-by: trustme
BT: yes
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Turning on LTCG affected too many projects, where customers applications
would take a long time linking, severly affecting their development time
(even though it was only added for release builds)
We turn it off by default, and add a -ltcg configuration option, and the
possibility to also do CONFIG+=ltcg in projects, should they not want it
for Qt, but in their own projects. (Same, they can build Qt with it, and
do CONFIG-=ltcg for their project)
Reviewed-by: andy
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than
anything else. One of the side effects of this work was that it was
relatively little work to get QtGui compiling when Q_WS_S60 is not
defined.
Based on this we introduce two new configure options that control S60
integration. Currently the -no-s60 option will not work entirely
because the 's60main' module has not yet been refactored and still has
a dependancy on the S60 libraries.
Reviewed-by: axis <qt-info@nokia.com>
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.
Rev-By: Harald Fernengel
Rev-By: Ralf Engels
|
| | |
|