Commit 08c6854f authored by dt's avatar dt
Browse files

Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1

parents 05245af9 e915b972
......@@ -65,7 +65,9 @@ Mac
* Open in Finder action in project tree.
Linux
* Don't crash because of incompatible libQt3Support.
* Don't crash because of incompatible libQt3Support:
Provide a wrapper script and ship libQt3Support.
(Fixes crashes e.g. in file dialogs on openSUSE 11.1)
Lots of improvements to
......@@ -76,4 +78,4 @@ Lots of improvements to
Additional credits go to:
* Martin Aumueller <aumuell@reserv.at> (FakeVim improvements)
* Kris Wong (different patches)
* Kris Wong (various patches)
......@@ -1172,14 +1172,13 @@
\section1 Debugging Helper Library
While debugging Qt Creator dynamically loads a helper library into
your program. This helper library enables Qt Creator to pretty print
Qt and STL types. The Qt SDK package already contains a prebuilt
debugging helper library. To create a debugging helper library
select the \{Options} from the \gui{Tools} menu, and go to the
\gui{Qt/Qt Versions} pane. As the internal layout of qt can
change between versions, the debugging helper library is build
per Qt Version.
While debugging Qt Creator dynamically loads a helper library into your
program. This helper library enables Qt Creator to pretty print Qt and STL
types. The Qt SDK package already contains a prebuilt debugging helper
library. To create a debugging helper library, select the \gui{Options}
from the \gui{Tools} menu, and go to the \gui{Qt/Qt Versions} pane. As the
internal layout of qt can change between versions, the debugging helper
library is built for each Qt version.
\section1 A Walkthrough for the Debugger Frontend
......@@ -1274,10 +1273,12 @@
not have an in-place build, Qt Creator lets you specify the directory in
which the project is built (shadow build).
\image qtcreator-cmake-import-wizard1.png
The screenshot below shows how you can specify command line arguments to
\c CMake for your project.
###TODO one, two pictures ? \image qtcreator-import-wizard.png
\image qtcreator-cmake-import-wizard2.png
Normally, there is no need to pass any command line arguments for projects
that are already built, as \c CMake caches that information.
......@@ -1292,7 +1293,7 @@
By default Qt Creator builds the "all" target. You can change which
targets get build in the Project/Build Settings.
### \image qtcreator-build-settings.png
\image qtcreator-cmake-build-settings.png
Currently only one build configuration is supported and the
build directory can't be changed after the initial import. This
......@@ -1597,10 +1598,6 @@
paths may fail. For example, remounting parts of a file system
using the --bind mount option.
\o Running Qt Creator on Windows with 16 bit color depth results in
black icons and possible crashes. This was fixed in an updated
version released 05 March 2009.
\o There is no syntax highlighting for \c CMake project files.
\o Project files included from \c{CMakeLists.txt} are not shown in the
......
TEMPLATE = lib
CONFIG += shared
linux-* {
CONFIG -= release
CONFIG += debug
}
SOURCES=gdbmacros.cpp
......@@ -334,31 +334,41 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
m_d->m_splitAction = new QAction(tr("Split"), this);
cmd = am->registerAction(m_d->m_splitAction, Constants::SPLIT, editManagerContext);
#ifndef Q_OS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,2")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_d->m_splitAction, SIGNAL(triggered()), this, SLOT(split()));
m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this);
cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext);
#ifndef Q_OS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,3")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_d->m_splitSideBySideAction, SIGNAL(triggered()), this, SLOT(splitSideBySide()));
m_d->m_removeCurrentSplitAction = new QAction(tr("Remove Current Split"), this);
cmd = am->registerAction(m_d->m_removeCurrentSplitAction, Constants::REMOVE_CURRENT_SPLIT, editManagerContext);
#ifndef Q_OS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,0")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_d->m_removeCurrentSplitAction, SIGNAL(triggered()), this, SLOT(removeCurrentSplit()));
m_d->m_removeAllSplitsAction = new QAction(tr("Remove All Splits"), this);
cmd = am->registerAction(m_d->m_removeAllSplitsAction, Constants::REMOVE_ALL_SPLITS, editManagerContext);
#ifndef Q_OS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,1")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_d->m_removeAllSplitsAction, SIGNAL(triggered()), this, SLOT(removeAllSplits()));
m_d->m_gotoOtherSplitAction = new QAction(tr("Goto Other Split"), this);
cmd = am->registerAction(m_d->m_gotoOtherSplitAction, Constants::GOTO_OTHER_SPLIT, editManagerContext);
#ifndef Q_OS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,o")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_d->m_gotoOtherSplitAction, SIGNAL(triggered()), this, SLOT(gotoOtherSplit()));
......
......@@ -1096,6 +1096,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_mode = InsertMode;
moveToEndOfLine();
m_lastInsertion.clear();
} else if (key == control('a')) {
// FIXME: eat it to prevent the global "select all" shortcut to trigger
} else if (key == 'b') {
m_moveType = MoveExclusive;
moveToWordBoundary(false, false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment