Daniel Teske
ab9d5ab535
Qml ColorTip: Remove border
...
Task-number: QTCREATORBUG-7273
Change-Id: I9a182d9385494a9f67843b8f022bcddbf9669c37
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2014-08-08 12:12:07 +02:00
Orgad Shaneh
62d98daa58
Utils: Remove unneeded namespace qualifications
...
Change-Id: Iacab8410ab4d3b63f96e7541b450e3cc729ab662
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-07-16 14:15:09 +02:00
Robert Loehning
746c5d8863
Incremented year in copyright info
...
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-01-08 08:29:47 +01:00
Oswald Buddenhagen
1fda2111d4
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Oswald Buddenhagen
f1cec4629e
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/libs/utils/tooltip/tips.cpp
src/plugins/coreplugin/versiondialog.cpp
src/plugins/projectexplorer/kitinformationconfigwidget.cpp
src/plugins/qnx/blackberryapplicationrunner.cpp
src/plugins/qnx/blackberrydeployconfiguration.cpp
src/plugins/qnx/blackberrydeployconfiguration.h
src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Christian Kandeler
497843c951
Utils: Fix qbs build.
...
Also remove superfluous "utils/tooltip" include path from both qmake
and qbs project files.
Change-Id: Ifa97984d462cbf1e344ff8ba0104353010e8c691
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-01-14 13:27:55 +01:00
Daniel Teske
8e75e611a5
Move TextEditor::ToolTip to Utils
...
To enabled reuse from all plugins.
Change-Id: I1de68c8e6ed017d45f1248b2043f9611becc3b54
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-01-11 15:06:00 +01:00
