| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
configure.exe
|
| | |
|
|/
|
|
| |
In addition removed those options from confqt.bat and confsbsv2.bat
|
| |
|
|
|
|
|
|
|
|
|
| |
We cannot use -openssl-linked to create official SIS packages, due to
US export regulations or some legal issues. That's why Open SSL symbols
are resolved at runtime.
The runtime resolving of OpenSSL symbols is default behaviour on other
platforms as well.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
This change should be quite safe, since all Qt <-> STL type conversions
are implemented in inline methods. The only major difference is that new
operator is now used from STL instead of one from e32base.h
Of course, this change also requires that you have STLport installed to
your SDK. This should be the case if you have installed the latest
Open C/C++ plug-in from forum nokia.
|
|
|
|
| |
(MSVC 2008, No MS runtimes, UPXed)
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| | |
|
| |
| |
| |
| |
| |
| | |
This reverts commit f0239a4983dd84b0e23c1e6f796c5c44dfde26b2.
The old change did not write out QT_EDITION etc. to qconfig.h
causing the build to break.
|
| |
| |
| |
| |
| | |
Reviewed-by: mauricek
BT: yes
|
| |
| |
| |
| |
| | |
Reviewed-by: TrustMe
BT: yes
|
| |
|
|
|