| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
no point in it
Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit dc810b81a38a2a4d33f6909ff213809e1bf384ca)
|
|
|
|
|
|
|
|
| |
we rely on a syncqt'd tree anyway
Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 946501ab350f0c3dbaf163c03415f459efb8c6bd)
|
|
|
|
|
|
| |
Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)
|
|
|
|
|
|
|
|
| |
saves us some pointless code
Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)
|
|
|
|
|
|
|
| |
qlocale functions were splitted in severl files, just add them back.
Task-number: QTBUG-18932
Reviewed-by: TrustMe
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15393
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/s60installs/bwins/QtCoreu.def
|
| |
| |
| |
| | |
Reviewed-by: mariusSO
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: ossi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
|
|
|
| |
Enables building the default media service backend for a platform.
Is on by default if the build environment requirements are met and
-no-mediaservice disables the option.
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
| |
Exposing epocRoot() to the configure application allows it to
determine the location of the currently active Symbian SDK, so that
support for optional SDK features can be checked.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
| |
Configure now shares - at the source level - a single implementation
of this function with qmake.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
| |
Use the -MT command line option so it links statically with libc.
The reason for this is that not all windows versions have the DLL
"out of the box".
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Added qtextcodec and qutfcodec to bootstrapped applications (checksdk
and configure)
Reviewed-by: trustme
|
|
|
|
|
|
|
| |
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
|
|