diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-08 14:44:30 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-08 15:47:00 +0100 |
| commit | 1d1d2f0b748e33caaa78d9b14fb34847cd0323f7 (patch) | |
| tree | e6fe1a32e2801b937125a8fc673d06196484823a /src/plugins/coreplugin/actionmanager | |
| parent | cb1cddb885addaeb4cf59a940ee64897bd4f17cf (diff) | |
| download | qt-creator-1d1d2f0b748e33caaa78d9b14fb34847cd0323f7.tar.gz | |
Compile with Qt 5.
- 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>
Diffstat (limited to 'src/plugins/coreplugin/actionmanager')
| -rw-r--r-- | src/plugins/coreplugin/actionmanager/commandmappings.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 1934f280f0..69060ff2c9 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -31,6 +31,7 @@ **************************************************************************/ #include "commandmappings.h" +#include "shortcutsettings.h" #include "ui_commandmappings.h" #include "actionmanager_p.h" #include "actionmanager/command.h" |