| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
in practice, this matters only for backslashed line continuations
Task-number: 255336
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: 254451
Reviewed-by: eskil
BT: yes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
in atomic operations, we declare Interlock... functions in the namespace
That can confuse the compiler because they are also declared in another
header outside the namespace.
Same problem in clucene where we include windows.h from within the NS.
Task-number: 254214
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When a form is loaded, Designer will set the path to the resource as
an absolute path rather than the path actually stored in the file. There
is code to work around this to make file paths relative when saving the
file later on, but no work around for Qt Jambi. So when saving Qt Jambi
forms, you would get an absolute path to the resource which contains the
location of the resource file (.jar or on disk) This of course breaks
the concept of resources, as the .jui file was no longer portable. The
fix is to special case Qt Jambi resources and set the relative path
when loading them.
The patch has no effect on regular Designer.
Task-number: 254621
Reviewed-by: Kai Koehne
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Additionally we turn -ltcg on by default on Windows CE.
See commit 56191830 for details.
Reviewed-by: mauricek
BT: yes
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Thomas Sondergaard (2):
Danish translations
Updated danish translations. Added them to relevant project files.
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: kh
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Correcting invalid padding values. none is not a valid padding value.
Rev-by: David Boddie
|
| | | |
| | | |
| | | |
| | | | |
Task-number: 249222
|
| | | |
| | | |
| | | |
| | | | |
Task-number: 251486
|
|/ / /
| | |
| | |
| | | |
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.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Java, "null" is represented as a keyword, not as the integer 0. The
old code assumed the latter. Code such as
translate("fooBar", "fooBar", null);
would thus not be detected by lupdate when parsing Java files.
Reviewed-by: ossi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
immensely increase readability"
This was pushed accidentially.
This reverts commit ffecdf0bf9f25f7ab9aa4f69e37507dd595fecea.
|
| |\ \ |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
increase readability
Unfortunately the patch causes quite some regressions and I think some refectoring of this class
would be needed.
I didn't do that since there is no API docs, the variable naming is not very clarifying and the
code is hard to read due to it not using the coding style and mixing tabs as well as spaces.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
T & QMap::operator[]: "If the map contains no item with key key, the
function inserts a default-constructed value into the map with key key,
and returns a reference to it"
How many occurences of 'dictionary["foo"].startsWith("bar")' has that
file by the way?
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Restore 4.4 behaviour by using a QStackedLayout as the layout containing
the actual form (as was in 4.4). The difference in behaviour was caused
by insertion of an additional widget with a QVBoxLayout which is supposed
to ease setting of inheritable properties (style, etc).
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: 253236
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QDesignerFormWindowCursor::setProperty.
Ensure the text does not get clobbered by the subproperty handling.
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: 253278
|
| |/
| |
| |
| |
| |
| | |
foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network
Reviewed-by: Samuel
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: 163220
Added to FormWindowBase. Required among other
things for Qt Creator code completion for
uic-generated-headers.
Acked-by: dt <qtc-committer@nokia.com>
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also mentioned an important point: If you subclass QUiLoader and
reimplement either createAction(), createActionGroup(), createLayout(),
or createWidget() -- you must call the original implementation first,
within your implementation.
Reviewed-by: João Abecasis <joao@abecasis.name>
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Don't say we produce output when no options are passed if we don't.
Task-number: 222778
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| |
| |
| |
| | |
Reviewed-by: nrc
|
| | |
|