Orgad Shaneh
ad9e7ccab6
Fix coding style for else statements
...
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-07-17 11:11:25 +02: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
hjk
c74835d519
Tooltip: Remove TipFactory
...
It's not really used as such.
Change-Id: Ia748cdb5273d661dfea9f8f39a17a872d3ee4de6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-01-23 10:47:27 +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
