| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/qt.prf
qmake/Makefile.unix
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/src.pro
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| |
| | |
merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
"../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier.
So move the Q_DECLARE_METATYPE before the use.
Reviewed-By: hjk <qtc-committer@nokia.com>
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
merge-with-qt-master
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/Makefile.unix
qmake/generators/makefile.cpp
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
Remove Designer-specific handling of isDirty() due to its
bug-proneness, use instead an extended QUndoStack.that allows
for setting to 'dirty' without commands for some special cases.
Task-number: QTBUG-8041
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Remove special handling and storing of commands. Customize
SetPropertyCommand such that it is able to perform a transformation
of the new value., thus, the same (relative) distance can be used
on all widgets and the normal command merging mechanism can be used
to merge subsequent moves correctly.
Task-number: QTBUG-8213
|
| | |\ |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
|
| | |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
A few trivial optimizations
Rewrote bookmark handling, the previous code was just plain awful.
Small style cleanup.
Fix some warnings.
Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
Designer: Support the 'windowOpacity'-property for forms.
Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
Assistant: Treat "unfiltered" filter in a apecial way.
Assistant: Give meaningful context to translations.
Fixed handling of paths containing ".." in QFileSystemModel on Windows.
QAbstractItemModel docs: Fix typo.
Assistant: Eliminate private tr contexts.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Broken by introduction of new signal with extended parameters.
Emit both signals and block against each other.
Tested against Eclipse integration.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-7764
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Analogous to windowTitle, etc.
Task-number: QTBUG-7822
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/corelib/global/qglobal.h
src/gui/dialogs/qfiledialog_win.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Introduce special filter string containing name plus class name
if it is different and not a layout.
Task-number: QTBUG-5492
|
| |\ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Conflict resolution was heavily based on manual application of commit
9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
|
| | | |_|_|_|_|_|_|_|/
| |/| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Trond Kjernåsen <trond@trolltech.com>
Task-number: QTBUG-8046
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Merge-request: 440
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fix spelling errors, foreach()/QString usage, explicit constructors.
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix source code scanning issues.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fix spelling errors, foreach()/QString usage, explicit constructors.
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We just build uitools like on Symbian.
The following subdirs have been removed from tools/designer/src/src.pro
tools/designer/src/lib
tools/designer/src/components
Reviewed-by: mauricek
|
| | | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTCREATORBUG-592
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
using
LIBS += -LanyDir
is wrong as that depends on 'ld' accepting -L
the correct cross-platform approach is to use
QMAKE_LIBDIR += anyDir
|
| | |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7432
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| |\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-4685
Reviewed-by: TrustMe
|
| | | |_|_|/
| |/| | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
... that has a white background color.
The selection handles inherited the form's stylesheet. Fix by parenting
them on the (internal) form container widget.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-6757
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Avoid linking the solutions used by Designer twice (in the two
Designer libraries). Just use the include paths in case of
static linking.
Reviewed-by: Carlos Duclos <carlos.duclos@nokia.com>
Task-number: QTBUG-6863
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
format as in Property editor and elsewhere for consistence.
Task-number: QTBUG-6760
|
| | |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Implement the property sheet (isChanged/reset) correctly and do a
hack for resetting the visibility.
Task-number: QTBUG-6505
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Mac QWidget::destroy() sends an AcceptDropsChange event after
clearing the guards for QPointer. This was used to store a QPointer to
the widget being deleted & that will never be cleared.
The fix removed the setAcceptDrops() from destroy. And as an extra
protection make sure designer will not treat that event as interesting.
Task-number: QTCREATORBUG-307
Reviewed-by: Denis Dzyubenko
Reviewed-by: Friedemann Kleint
|
| |\ \ |
|
| | | |
| | |
| | |
| | | |
Over src/ tools/ examples/ and demos/
|
| | |/
| |
| |
| |
| |
| |
| | |
The autotest are included
Task-number: QTBUG-5884
Reviewed-by: ogoffart
|
| | |
| |
| |
| | |
Reviewed-by: Pierre Rossi
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tools/configure/configureapp.cpp
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/qscopedpointer.h
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Designer-formbuilder/uic incorrectly considered custom containers that
do not inherit a known page-based container (say QTabWidget) as
instances of QLayoutWidget, giving them a default margin of 0.
Add a check for the custom widget <container>-element to the checks
for QLayoutWidget in uic/formbuilder.
In the formbuilder, introduce a new data structure to store
custom widget information instead of using 3 separate hashes.
Adapt one autotest baseline (Qt 3).
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-5335
|
