| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Merge-request: 2235
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Simon Hausmann
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
|
|
| |
Don't build the googlechat example if QSslSocket isn't available.
And even then also perform a run-time check and display an error page
if SSL is not available.
This is because the login into Google Chat works through an https website.
Reviewed-by: Jesper
|
| |
|
|
|
|
|
|
| |
examplesbase.pri sounded to generic and it was not obvious that this
was only for Symbian. Also merged the different symbian rules if they
were spread around in the .pro file.
Reviewed-by: Aleksandar Sasha Babic
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |
| |
| |
| | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |
|
| |
|
