| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QTBUG-7420
Reviewed-by: kh1
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Update Polish translations
Assistant: Add documentation for -remove-search-index.
Designer: Handle "visible"-properties of item view headers correctly.
Fix .gitignore to not ignore qdoc.pro
Update polish translations
Fix broken delete key, some cleanup.
Assistant: Fix race condition in index creation.
Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
|/
|
|
|
|
|
| |
uses of QT_DEPRECATED must be protected by #ifdef
Task-number: QTBUG-6649
Reviewed-by: João Abecasis
|
|
|
|
|
|
|
| |
We need to make sure the running thread can respond to the cancel
request before overwriting it.
Reviewed-by: kh1
|
|\ |
|
| |
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
| |
| |
| |
| | |
Reviewed-By: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a bug that can only be seen on windows when we have the
collection storage location on e.g. Drive c:\ while the help files
reside on a different drive.
QHelpEngineCore::registerDocumentation would fail to gather the proper
relative file path, thus register the file with it's absolute path. In
QHelpEngineCore::documentationFileName we still assumed that all files
in the collection are registered relative and fail to concatenate the
proper path. Now we check if the path is already absolute and return.
Reviewed-by: ck
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/ |
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Obsolete the plural version, and replace its usage in Qt.
Reviewed-by: Andreas Aardal Hanssen
|
|/
|
|
|
|
|
|
|
| |
Task-number: QTBUG-1770
Reviewed-by: kh1
Conflicts:
tools/assistant/lib/lib.pro
|
| |
|
|
|
|
|
| |
The offending code is normally ifdef'ed out, so the bug did not manifest
itself before.
|
|
|
|
|
|
|
| |
... by establishing a default behaviour for the switch statements that
follow.
Reviewed-by: ck
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qpainter/tst_qpainter.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
demos/boxes/vector.h
demos/embedded/fluidlauncher/pictureflow.cpp
demos/embedded/fluidlauncher/pictureflow.h
doc/src/desktop-integration.qdoc
doc/src/distributingqt.qdoc
doc/src/examples-overview.qdoc
doc/src/examples.qdoc
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/geometry.qdoc
doc/src/groups.qdoc
doc/src/objecttrees.qdoc
doc/src/platform-notes.qdoc
doc/src/plugins-howto.qdoc
doc/src/qt3support.qdoc
doc/src/qtdbus.qdoc
doc/src/qtdesigner.qdoc
doc/src/qtgui.qdoc
doc/src/qtmain.qdoc
doc/src/qtopengl.qdoc
doc/src/qtsvg.qdoc
doc/src/qtuiloader.qdoc
doc/src/qundo.qdoc
doc/src/richtext.qdoc
doc/src/topics.qdoc
src/corelib/tools/qdumper.cpp
src/gui/embedded/qkbdpc101_qws.cpp
src/gui/embedded/qkbdsl5000_qws.cpp
src/gui/embedded/qkbdusb_qws.cpp
src/gui/embedded/qkbdvr41xx_qws.cpp
src/gui/embedded/qkbdyopy_qws.cpp
src/gui/embedded/qmousebus_qws.cpp
src/gui/embedded/qmousevr41xx_qws.cpp
src/gui/embedded/qmouseyopy_qws.cpp
src/gui/painting/qpaintengine_d3d.cpp
src/gui/painting/qwindowsurface_d3d.cpp
src/opengl/gl2paintengineex/glgc_shader_source.h
src/opengl/gl2paintengineex/qglpexshadermanager.cpp
src/opengl/gl2paintengineex/qglpexshadermanager_p.h
src/opengl/gl2paintengineex/qglshader.cpp
src/opengl/gl2paintengineex/qglshader_p.h
src/opengl/util/fragmentprograms_p.h
src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
src/script/parser/qscript.g
src/script/qscriptarray_p.h
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
src/script/qscriptclassdata_p.h
src/script/qscriptcompiler.cpp
src/script/qscriptcompiler_p.h
src/script/qscriptcontext.cpp
src/script/qscriptcontext_p.cpp
src/script/qscriptcontext_p.h
src/script/qscriptcontextfwd_p.h
src/script/qscriptecmaarray.cpp
src/script/qscriptecmaarray_p.h
src/script/qscriptecmaboolean.cpp
src/script/qscriptecmacore.cpp
src/script/qscriptecmadate.cpp
src/script/qscriptecmadate_p.h
src/script/qscriptecmaerror.cpp
src/script/qscriptecmaerror_p.h
src/script/qscriptecmafunction.cpp
src/script/qscriptecmafunction_p.h
src/script/qscriptecmaglobal.cpp
src/script/qscriptecmaglobal_p.h
src/script/qscriptecmamath.cpp
src/script/qscriptecmamath_p.h
src/script/qscriptecmanumber.cpp
src/script/qscriptecmanumber_p.h
src/script/qscriptecmaobject.cpp
src/script/qscriptecmaobject_p.h
src/script/qscriptecmaregexp.cpp
src/script/qscriptecmaregexp_p.h
src/script/qscriptecmastring.cpp
src/script/qscriptecmastring_p.h
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptengine_p.h
src/script/qscriptenginefwd_p.h
src/script/qscriptextenumeration.cpp
src/script/qscriptextenumeration_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
src/script/qscriptextvariant.cpp
src/script/qscriptfunction.cpp
src/script/qscriptfunction_p.h
src/script/qscriptgc_p.h
src/script/qscriptmember_p.h
src/script/qscriptobject_p.h
src/script/qscriptprettypretty.cpp
src/script/qscriptprettypretty_p.h
src/script/qscriptvalue.cpp
src/script/qscriptvalueimpl.cpp
src/script/qscriptvalueimpl_p.h
src/script/qscriptvalueimplfwd_p.h
src/script/qscriptvalueiteratorimpl.cpp
src/script/qscriptxmlgenerator.cpp
src/script/qscriptxmlgenerator_p.h
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Fix for task 259252.
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: ck
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On the Mac, it means "-framework ApplicationServices -framework Carbon
-framework AppKit" are no longer part of the default LIBS in Qt
applications. This required a lot of fixes where we used Mac-specific
code in Qt.
On X11, it was very straightforward, because we apparently use very
little of X11 outside QtGui.
I haven't changed the Windows-specific LIBS paths, because I don't
know how Windows behaves. Windows has DLLs, but it links to static
"import" libraries. So is it static linking or dynamic linking?
Reviewed-By: Marius Storm-Olsen
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: 251278
Reviewed-by: kh
|
| | |
|
| |
| |
| |
| |
| |
| | |
Reading a help project was unacceptably slow with pattern matching.
Now we do it only for filenames that contain wildcard symbols.
Also, we cache the results of QDir::entryList() calls.
|
| |
| |
| |
| |
| |
| |
| | |
Moved common parts of QHelpSearchIndexReader{Default,Clucene} into
a new common base class QHelpSearchIndexReader.
Reviewed-by: kh
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| |
| |
| |
| |
| | |
Task-number: 257441
Reviewed-by: kh
|
|/
|
|
|
|
| |
The qhelpgenerator auto test was also updated to test the new feature.
Reviewed-by: kh
|
|
|
|
| |
Reviewed-by: kh <qtc-committer@nokia.com>
|
|
|
|
| |
Reviewed-by: ossi
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: kh
|
|
|
|
|
| |
Task-number: 255888
Reviewed-by: kh
|
| |
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
while parsing html files, we removed some entities the should have been
converted to there native representation, thus we were not able to find
them
Task-number: 247732
Reviewed-by: hjk
|
|
|