Commit 2823160c authored by dt's avatar dt

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

parents b2ee911e a82081c9
......@@ -294,7 +294,6 @@ private slots:
void showDebuggerOutput(const QString &prefix, const QString &msg);
void showDebuggerInput(const QString &prefix, const QString &msg);
void showApplicationOutput(const QString &data);
void showWidgetInDock(QWidget *dock);
void reloadDisassembler();
void disassemblerDockToggled(bool on);
......
......@@ -117,7 +117,7 @@ void ModulesWindow::contextMenuEvent(QContextMenuEvent *ev)
act6->setDisabled(name.isEmpty());
act7->setDisabled(name.isEmpty());
#ifndef Q_OS_LINUX
act7->setDisabled(true)l
act7->setDisabled(true);
#endif
menu.addAction(act0);
......
......@@ -861,7 +861,10 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_semicolonKey = key;
handleFfTt(key);
m_subsubmode = NoSubSubMode;
finishMovement();
finishMovement(QString("%1%2%3")
.arg(count())
.arg(QChar(m_semicolonType))
.arg(QChar(m_semicolonKey)));
} else if (m_submode == ReplaceSubMode) {
if (count() < rightDist() && text.size() == 1
&& (text.at(0).isPrint() || text.at(0).isSpace())) {
......@@ -1075,8 +1078,13 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_moveType = MoveInclusive;
moveToWordBoundary(true, true);
finishMovement();
} else if (key == 'f' || key == 'F') {
} else if (key == 'f') {
m_subsubmode = FtSubSubMode;
m_moveType = MoveInclusive;
m_subsubdata = key;
} else if (key == 'F') {
m_subsubmode = FtSubSubMode;
m_moveType = MoveExclusive;
m_subsubdata = key;
} else if (key == 'g') {
if (m_gflag) {
......@@ -1266,7 +1274,12 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_opcount.clear();
m_mvcount.clear();
enterInsertMode();
} else if (key == 't' || key == 'T') {
} else if (key == 't') {
m_moveType = MoveInclusive;
m_subsubmode = FtSubSubMode;
m_subsubdata = key;
} else if (key == 'T') {
m_moveType = MoveExclusive;
m_subsubmode = FtSubSubMode;
m_subsubdata = key;
} else if (key == 'u') {
......@@ -1984,11 +1997,6 @@ void FakeVimHandler::Private::handleFfTt(int key)
--pos;
else if (m_subsubdata == 'T')
++pos;
// FIXME: strange correction...
if (m_submode == DeleteSubMode && m_subsubdata == 'f')
++pos;
if (m_submode == DeleteSubMode && m_subsubdata == 't')
++pos;
if (forward)
m_tc.movePosition(Right, KeepAnchor, pos - m_tc.position());
......
......@@ -904,13 +904,19 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
// Special case were subdir is just an identifier:
// "SUBDIR = subid
// subid.subdir = realdir"
// or
// "SUBDIR = subid
// subid.file = realdir/realfile.pro"
QString realDir;
QString realFile;
const QString subDirKey = subDirVar + QLatin1String(".subdir");
const QString subDirFileKey = subDirVar + QLatin1String(".file");
if (reader->contains(subDirKey))
realDir = QFileInfo(reader->value(subDirKey)).filePath();
else
else if (reader->contains(subDirFileKey))
realDir = QFileInfo(reader->value(subDirFileKey)).filePath();
else
realDir = subDirVar;
QFileInfo info(realDir);
if (!info.isAbsolute())
......
......@@ -130,13 +130,6 @@ QString Qt4Manager::mimeType() const
ProjectExplorer::Project* Qt4Manager::openProject(const QString &fileName)
{
typedef QMultiMap<QString, QString> DependencyMap;
const QString dotSubDir = QLatin1String(".subdir");
const QString dotDepends = QLatin1String(".depends");
const QChar slash = QLatin1Char('/');
QString errorMessage;
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
messageManager->displayStatusBarMessage(tr("Loading project %1 ...").arg(fileName), 50000);
......
......@@ -54,3 +54,9 @@ unix {
RCC_DIR = $${OUT_PWD}/.rcc/
UI_DIR = $${OUT_PWD}/.uic/
}
linux-g++-* {
# Bail out on non-selfcontained libraries. Just a security measure
# to prevent checking in code that does not compile on other platforms.
QMAKE_LFLAGS += -Wl,--allow-shlib-undefined -Wl,--no-undefined
}
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