| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon.
|
| |
| |
| |
| |
| |
| | |
trailing semicolon.
Reviewed-by: Rohan McGovern
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
add the containing directories of all files specified on the command
line to the list of project roots. otherwise, the strings from headers
which are included before being encountered on the command line will be
omitted.
Task-number: QTBUG-10345
|
| |
| |
| |
| | |
missed that in 60acaf5e
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Synchronizing to latest tree
Adding correct hungarian translation
Search local directory if no qconfig file found in src/corelib/global/
Fix QT_NO_CLIPBOARD
Fix QT_NO_ACTION
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
translations/assistant_hu.ts: Translated: 231 of 231 (100%)
translations/designer_hu.ts: Translated: 85 of 1248 (6%)
translations/linguist_hu.ts: Translated: 393 of 393 (100%)
translations/qtconfig_hu.ts: Translated: 73 of 168 (43%)
translations/qt_help_hu.ts: Translated: 80 of 81 (98%)
translations/qt_hu.ts: Translated: 2402 of 2464 (97%)
translations/qvfb_hu.ts: Translated: 65 of 65 (100%)
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |
| | |
| | |
| | | |
ConversionData::error() does already newline-terminate the strings.
|
|/ /
| |
| |
| | |
Task-number: QTBUG-8044
|
| |
| |
| |
| |
| |
| |
| |
| | |
encoding the qt context as a magic comment was no particularly good
idea, as it provided no disambiguation as far as gettext is concerned.
so instead encode the context into msgctxt.
Task-number: QTBUG-10307
|
| |
| |
| |
| |
| |
| |
| | |
this contains some changes from symbian-commissioned "professional" translations
Merge-request: 621
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| |
| |
| |
| |
| | |
there is really no point in marking them "unfinished". later file
rewrites would reset the state anyway.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
do that by ignoring all equal signs and everything between and
including brackets. this makes static initializers look
effectively like function definitions, thus creating proper
context.
Task-number: QTBUG-9276
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qHash(QString) has only 28 bits, so we can use the upper bits
for flagging whether the hash is valid.
size effect:
LP32: align(4, 4 + 4 + 1) = 12 vs. align(4, 4 + 4) = 8
LP64: align(8, 8 + 8 + 1) = 24 vs. align(8, 8 + 8) = 16
P64: align(8, 8 + 4 + 1) = 16 vs. align(8, 8 + 4) = 16
|
| |
| |
| |
| |
| | |
making the range discontiguous just makes the switch()
jump table bigger or not applicable at all.
|
| |
| |
| |
| |
| |
| |
| | |
Ossi is right: on WinCE, _setmode is different from regular Windows
and the docs...
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| | |
... both from windows and the wince doc ...
Reviewed-by: joerg
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: joerg
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This adds a -no-gui switch to configure, allowing to build Qt without
QtGui and components depending on QtGui.
This is useful on headless servers, and in using QtCore, QtNetwork,
QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet.
Task-number: QTBUG-4007
Merge-request: 543
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
At least with g++ 3.4 on Solaris, they are. So you can't write
::isalpha because that expands to something invalid.
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
... as this is what gettext processors expect.
|
| |
| |
| |
| |
| | |
these are in fact the same as PO files, only that exporting to one
automatically drops translations.
|
| | |
|
| |
| |
| |
| |
| |
| | |
instead of doing string editing magic, parse the header properly.
don't add a template file comment, either - it's not mandatory, after
all.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
we set it to that value when writing xliff, as the header is mandatory
and no better value is possible. it seems unlikely that an unqualified
"english" would be used if somebody meant to actually specify a source
language, so this hack should be ok.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
Fix compilation with Sun CC: no semi-colon after Q_ENUM.
Remove the "Insert unicode control character" menu entry on X11.
adds a timeout option to QThreadPool::waitForDone();
Remove leading whitespace from Qt header macros.
Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
Add QDateTime members that operate on 64-bit milliseconds.
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
...
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- java & jui
- js, qs & qml
Task-number: QTBUG-9429
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| | |
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| | |
Task-number: QTBUG-8907
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| | |
Task-number: QTBUG-8360
|
| |
| |
| |
| |
| | |
Merge-request: 485
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| | |
QDeclarativeXXX.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|