| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ib36e02b526ddd9501efcc3907ac69d6e2664f4ac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
| |
The way it was done is deprecated in IFW 1.3 and removed in 1.4, and
there's no reason for us to use non-standard texts.
Change-Id: I05ef4974a3f47bd8ffe0bb3b1a226adac48aa954
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
| |
- the workingdir was inside the dmg so it couldn't unmounted
Task-number: QTBUG-28963
Change-Id: I183098108743d9cc0bd00fb6bfaa3e5755c08191
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I1edcf513d8d22dfc5abd87d0f339ea9d0b4015ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I47121fcce1c063a6a0af82ebac080f843d2d157f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
Added in the ipv6 patch.
Change-Id: I2d6257b9deb1f1fdec85dd89d799e69b04b1a462
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.
Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I5e20bd4e335c1cd9e0ffeb07dd8fdf1f5d4747ac
Reviewed-by: David Schulz <david.schulz@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Symbian is gone, and so is TRK.
Change-Id: I058e02d8990c5de0b9aa2f29ba7caebc30148f6d
Reviewed-by: David Schulz <david.schulz@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This makes code sharing between the Qt SDK Qt Creator component
and the standalone one much easier.
Change-Id: I9573ef24054d88dcabfa89666703f6eada29140c
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/debugger/qtquick-debugger-example.qdoc
Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
|
| |
| |
| |
| |
| |
| |
| |
| | |
Some code was there but the ui file and the showing code was missing.
Change-Id: I9a865ff7a10995d3b129e0b18c2f250bca852f9e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Newer versions of the installer framework continue only
with supported tags inside the installer config.xml file.
Change-Id: I87c0e8f079023b5ba7cf7cca248e1fa310b7a97e
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|/
|
|
|
| |
Change-Id: I1f4c85edcb5c5cad384fcf595b3f99bec7615ebb
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|
|
|
|
|
|
|
| |
Fix product names for QNX.
Add information about some bugs.
Change-Id: Iccfd8b98754b9e23f5d7f5bd8e189b511353bb6f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
Use dialog and menu item names correctly.
Change-Id: I1aa80481ece0c340fbf88be940fd5bc55a85d06b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|
|
|
|
| |
Change-Id: I3988d220ad2fd7d68c6f1cc8ba6caf933f50dfe0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I4b4294c3fcb0eb9dfc8b9f73040d4fae80944d8b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
| |
So that users don't have to read the bug reports to understand
what was changed.
Change-Id: I52020ebdbe492e8278fcf2b5f5bdbedb89c3f275
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I4be04b05063320687e7c174c7f0e513f03c062d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
|
|
|
| |
This change log entry was lost during a merge
conflict.
Change-Id: I2d89abcbc2aa546377a08828bb9f706cdd029414
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Move two debugging items from "C++ Support" to
"Debugging".
Create subsections for "Code completion" and "C++11
support" in "C++ Support".
Try to list related items together.
Change-Id: Id3cb1ac54ac1226adbc7a5d0413f6a5142f3365d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I2df164796febdb71d522407b792a5a626fe41fc3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
|
|
|
|
|
|
|
| |
Add a refactoring action that was also added.
Change-Id: I3f400a8003961714a5b650e75cb061fa983e5983
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
|
|
|
|
|
|
|
| |
Describe breakpoint settings in more detail.
Change-Id: I03a9f888fa29c3539f2ed6658f915da5c4c3adc9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: Id82e6fdc67a4794921f1a87def7ea0dae619c336
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
|
|
| |
Remove legacy code
Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I14e869ee4115062e7016dc5cd9e1a165a4599c5b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
| |
Change-Id: If160b9b164369b300bf02ae1bb68ea756261dbb7
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
| |
Change-Id: Iaec6b27f1cd62e9126112a6babe388bcf4fca4f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
|
|
|
|
|
| |
Change-Id: I01afa456b9d43cae5274c9e1f17285332c870e09
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
| |
'grok' is not general usage.
Change-Id: I17f40bf487d9d271dabb11613508eff77934a908
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
| |
Change-Id: I9eb5abdf608109714f41740ae9c00a4b8a81cbee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
| |
Change-Id: Ifadc3241b7715530d688508b79a1ce58eac77427
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Change-Id: I032255ba1d07103cf7f81cf88811fdc023101163
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidrunner.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
|
| |
| |
| |
| |
| | |
Change-Id: I0ea5f140fa6f973813d55bed0009dfb800466c40
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/debugger/gdb/gdboptionspage.cpp
src/plugins/fakevim/fakevimoptions.ui
src/share/share.qbs
Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With Qt5 qmlpuppet needs to find a platform plugin.
Task-number: QTCREATORBUG-8447
Change-Id: I701d17da7f68dfcdfaeda171e2421488462692eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qtsupport/baseqtversion.cpp
Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Especially important if you already assigned the file types
to a different application, or to keep defaults for VS users.
Depends on: https://codereview.qt-project.org/#change,38650
Change-Id: I2b272c25e03bcc264ca73450fd26aa82ec30c296
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/coreplugin/editormanager/openeditorsview.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlinspectoradapter.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/welcome/welcomeplugin.cpp
Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
|
| |
| |
| |
| |
| |
| |
| | |
Depends on: https://codereview.qt-project.org/#change,38650
Change-Id: Idbd91ec7873286fe4a371c6c9dcebddece4acf45
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
share/share.qbs
tests/auto/icheckbuild/icheckbuild.pro
Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
|