| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/coreplugin/mainwindow.cpp
Change-Id: I975a4208588d174ebb44054de56c5ac8d7c878fe
|
| |
| |
| |
| |
| |
| |
| | |
Works around QTBUG-25544
Change-Id: I136aaa403f78e9c3903abc013c3267bc3585f54b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|/
|
|
|
|
|
| |
This also allows simple setting of breakpoints on failed asserts.
Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I43c707cb3d27ac706052f8e46f0f1ef8c86e644e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
And adapt the other API respectively.
Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: I1a7047e0ccc074bb38661ecd34e2c0e64469d843
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
|
|
|
|
|
|
|
|
| |
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- QtQuick1 renaming.
- Start on qtconcurrent split (pending renaming of Qt Creator's
qtconcurrent library).
- QWinEventNotifier is a public class in Qt 5.
- Metatype system: Classes need to be known.
Change-Id: I5582e7cc2777bf791a08b049262217055769c80f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This crash can happen when enabling/disabling a certain combination
of plugins and restarting.
There was a null pointer de-reference that was occurring because the
qt4projectmanagerplugin was referencing an action that it believed
to have been registered by the texteditorplugin when it was initialized.
However, apparently the texteditorplugin was not initializing its actions
at plugin initialization, but rather when 'extensionsInitialized' was called.
I do not know the call graph for when this is to be called, but I encountered
at least one situation where the qt4projectmanagerplugin was being initialized
before this.
Change-Id: Iede1831e0ac9c92b80a079157e1bdc8c66473470
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.
This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)
Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
| |
Change-Id: I4b7223e16eb727e9d98cc973eb64cb4f9feccdcc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
| |
Instead of doing it duplicated in the general and the fakevim shortcut
settings.
Change-Id: Id4b0e5b0630f1e94c825528f1c038776dc205aa3
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
QString construction.
- Fix repeated invocation of Container.end() in loops.
Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
|
| |
Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
| |
Make sure all ui-files are in the plugin's internal namespace.
Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: Ic794fdc6a582f4a03d84b6220c59111044c753b9
Reviewed-by: hjk <qthjk@ovi.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
|
| |
| |
| |
| |
| | |
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I6e84b3da2f97863a144e95bf0e79a4318ef59986
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Presentation mode can be entered by passing -presentationMode when
starting Qt Creator.
It displays a popup with the keyboard shortcut of the commands
that are triggered. Great for the DevDays;-)
Change-Id: I897966aab491f98e2a5abc4433c40b04e2a8db57
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
| |
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
| |
Change-Id: I8f83b11250817425a06c063532e5662cb72fb7dc
Reviewed-on: http://codereview.qt.nokia.com/4204
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I17c4d17583d401fb537d5956f5b07a1dc12906e1
Reviewed-on: http://codereview.qt.nokia.com/893
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
| |
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
|
| |
|
|
|
|
|
|
| |
lots of use of Utils::FileSaver and Utils::FileReader
Task-number: QTCREATORBUG-1619
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Rewrite PersistentSettingsReader/Write and CommandsFile to
use QXmlStreamReader/Writer.
Files will now be written out using native line endings and
contain proper XML version information.
Keyboard schemes will contain empty shortcut elements for empty
elements.
Rubber-stamped-by: con
|
|/ |
|
|
|
|
| |
We decided to have text-based buttons by default.
|
|
|
|
| |
This reverts commit 561f87fcb9d58aaccbccd424417e71b79798ff6b.
|
|
|
|
| |
This reverts commit c5b57ea5f9927a0843d37c793788892a5131c1ee.
|
|
|
|
| |
Continuing 561f87fcb9d58aaccbccd424417e71b79798ff6b
|
|
|
|
| |
In terms of buttons, layouts, aesthetics in general.
|
|
|
|
|
|
|
| |
Not possible to reset them yet.
Saves the change in the settings instead of writing new tools xml files.
This probably needs to be adapted for tools that are "local" from the
beginning.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Almost working as the removeAction, but we don't need to check if the command is empty here.
Merge-request: 236
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
| |
They need to remove them from their internal structure.
|
|
|
|
|
|
|
| |
Make groups explicit instead of magic integer stuff.
That also makes group ordering explicit instead of magically working
(the way we happened to use it and the way unique id manager is
implemented).
|
|
|
|
| |
Make them be correctly updated regarding to current context.
|
|
|
|
|
| |
Task-Nr: QTCREATORBUG-3517
Reviewed-By: con
|
| |
|