| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This is just a refactoring change to split huge unreadable qlocale.cpp into
multiple files.
Reviewed-by: Zeno Albisser
|
|
|
|
|
|
|
|
|
|
| |
Testing done:
win32-msvc2008 and Mac OS X - qfile, qfileinfo, qdir, qdiriterator,
qtemporaryfile autotests
symbian-sbsv2 - qtcore, qtgui, qtxml autotests
win32-g++ - compilation test for qmake
Reviewed-By: Thomas Zander
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/Makefile.win32
qmake/qmake.pri
src/corelib/io/qdir.cpp
src/corelib/io/qfileinfo.cpp
src/corelib/io/qfileinfo_p.h
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/tools/bootstrap/bootstrap.pro
tests/auto/qfileinfo/tst_qfileinfo.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
demos/declarative/snake/content/snake.js
demos/declarative/snake/snake.qml
doc/src/development/qmake-manual.qdoc
src/corelib/plugin/plugin.pri
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qdesktopwidget_win.cpp
src/gui/painting/qdrawhelper.cpp
tests/auto/qdir/tst_qdir.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was a security hole that has been there for a while, but the
public awareness have recently rised so the threat is more imminent
now.
The solution is to fix all places where we dynamically load system
libraries. More specifically, we now load all system libraries with
an absolute path that points to a library in the system directory
(usually c:\windows\system32).
We therefore introduce a small class named QSystemLibrary that only loads
libraries located in the system path. This shares some of the API with
QLibrary (in order to make the patch as small as possible).
We don't fix QLibrary due to risk of regressions. In
addition, applications can fix the code that calls QLibrary themselves.
The problem does not apply to Windows CE, since the search order is
documented as not searching in the current directory.
However, it touches some CE-specific code - therefore QSystemLibrary
is sometimes used on WinCE (however, it will just do a normal
LoadLibrary() since its safe anyway).
This change does not affect the testability plugin (it is not clearly
documented where that plugin is located, and the plugin should never
be used in production code anyway)
Loading OpenSSL libraries
The ssl libraries are handled specially, and searched in this order
(we cannot expect them to always be in the system folder):
1. Application path
2. System libraries path
3. Trying all paths inside the PATH environment variable
Task-number: QT-3825
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This removes extra baggage from our bootstapped tools, and also
ensures that we can compile it with host-g++ on Maemo which has a
problem parsing our deprecated macros inside templates.
Reviewed-by: Robert Griebl
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The search is implemented using FindFirstFileEx(). Following
optimizations are done
* Using large Fetch buffer on Windows 7
* Querying only the long file name
* Querying for directories only, depending on QDir::Filters
Reviewed-by: Joao
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into new internal native iterators. QFSFileEngineIterator will use that
internally, currently only on non-windows platforms. This implementation
can be reused on Windows once the native iterators are in place there as
well.
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | | |
Added qfilesystemengine_mac to the build system, but hollowed it out.
This way, it is ready for immediate use without having unnecessary stubs
that can be found in the _unix version already.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Only stubs, for now, but it's a start.
Reviewed-by: Thomas Zander
|
| | |
| | |
| | |
| | | |
Reviewed-by: João Abecasis
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Since we're refactoring code out of QFSFileEngine the new internal
classes have to be compiled in together with the old engines.
For the time being, we'll assume Mac uses the unix version of the
engine. We'll fork those only if and as needed.
|
| |
| |
| |
| |
| | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
configuration option on Windows and Symbian platforms.
Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>)
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This also switches the official def file variable in qmake profiles
to DEF_FILE.
Support for freezing def files was also added, but needs more work
and is therefore disabled for now.
Task: QTBUG-7510
Task: QTBUG-8052
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The sis target will depend on the main build target of each project,
which should make it possible to simply run "make sis" in the root of
a clean tree (after configure, of course), and have sis packages
generated for everything. It works at least for Qt.
This required some changes to the dependency generation in Qt, to
make sure that s60installs builds its package after all of Qt, and
that fluidlauncher has all the required files before building a
package.
In addition, all the sis target code was moved into its own qmake
feature file, called sis_targets. It is currently enabled by default
for Symbian.
|
| | |
| | |
| | |
| | | |
Fix the borked fix and re-add the dollar signs.
|
| |/
| |
| |
| |
| |
| |
| |
| | |
using
LIBS += -LanyDir
is wrong as that depends on 'ld' accepting -L
the correct cross-platform approach is to use
QMAKE_LIBDIR += anyDir
|
|/
|
|
|
|
|
|
|
| |
There is no possibility to define which zlib should be used for the
bootstrapped tools when cross compiling.
Therefor we will force qt-zlib to be used for bootstrapped tools.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-8678
|
|
|
|
|
|
|
|
|
| |
The qlibraryinfo.cpp is only needed by lrelease. It has a hack for
qmake_libraryInfoFile(), which doesn't work on AIX. So don't put
qlibraryinfo.cpp in libbootstrap.a, but instead build directly for
lrelease.
Reviewed-by: thiago
|
| |
|
|
|
|
|
|
|
|
| |
needed for build-time qm generation in qt itself.
the downsides are a) that the other bootstrapped tools grow by ~12kB
(on x86) due to qdatastream being pulled in by qbytearray and qstring
and b) that lrelease isn't l10n'd itself anymore (the latter could be
fixed by building a non-qobject qtranslator).
|
|
|
|
|
|
|
|
| |
In the old days, some compilers would implicitly include the *.cpp
file if the *.h file contained templates. That's why we had qlistdata.cpp
not qlist.cpp. Those compilers are no longer supported.
Rev-by: Harald Fernengel
|
| |
|
|
|
|
|
|
|
| |
This is preparation for making Windows CE checksdk use the bootstrap
lib.
Reviewed-by: thartman
|
|
|