diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0 index 4f712c24741..3ebced02344 100644 --- a/dist/changes-2.1.0 +++ b/dist/changes-2.1.0 @@ -8,23 +8,27 @@ git clone git://gitorious.org/qt-creator/qt-creator.git git log --cherry-pick --pretty=oneline v2.0.0...v2.1.0 General + * Fix the suggested path in the new dialog in case of sub projects + * Search dialog now opens the completion box for the search term on cursor down Editing - - * FakeVim: Fix issues with non-letter keys on non-US keyboards - * FakeVim: Fix performance of find/replace + * FakeVim: Fix issues with non-letter keys on non-US keyboards + * FakeVim: Fix performance of find/replace + * Fixed disabled "Open with" context menu in project tree. C++ Support Project support + * Fix auto-scrolling in application and compile output Debugging - * Fix display of certain structures within containers * Fix display of typedefs of typedefs of simple types such as qulonglong * Fix behaviour of 'step' and 'next' when a lower frame was selected * Fix std::string display for objects with (the legal) ref count -1 * Improve gdb version string parsing + * Fix that the newest version of compiled debugging helper was not used + if there was an older version still was around in a different search path QML/JS Support * New QmlDesigner @@ -39,6 +43,7 @@ Mac Linux (GNOME and KDE) Windows + * Fixed that some menu items got disabled during keyboard navigation Additional credits go to: diff --git a/doc/images/qtcreator-maemo-deb-package.png b/doc/images/qtcreator-maemo-deb-package.png index 11beaa83687..9003b6b7f70 100644 Binary files a/doc/images/qtcreator-maemo-deb-package.png and b/doc/images/qtcreator-maemo-deb-package.png differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 0e01f2caca7..14431d6d5bc 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -2178,7 +2178,8 @@ build the application. Qt Creator generates an installation package, installs in on the device, - and executes it. The application views are displayed on the Nokia N900. + and executes it. You can skip the packaging step to save some time. + The application views are displayed on the Nokia N900. Command-line output is visible in the Qt Creator \gui {Application Output} view. @@ -2187,13 +2188,21 @@ \section2 Creating Installation Packages When you build the application for the \gui{Maemo} target, Qt - Creator automatically generates a debian installation package - in the project folder. You can deliver the installation package to + Creator generates a debian installation package + in the project folder by default. You can deliver the installation package to users for installation on Maemo devices. - You can add other files to the installation package in the - \gui {Create package} step in the build configuration. Add files - to the \gui {Package contents} field. In \gui {Local File Path}, + The name of the installation package is displayed in the \gui {Create Package} + field. You can change the version number in the \gui {Version number} field. + + When you test your application on a device or the Maemo emulator, you can + save some time by installing the built files directly on the connected device + without packaging. Select the \gui {Skip packaging step} check box in the + \gui {Create Package} step in the \gui {Build Settings}. + + You can add other files to the installed files in the + \gui {Create Package} step, the \gui {Package contents} field. In + \gui {Local File Path}, specify the location of the file on the development PC. In \gui {Remote File Path}, specify the folder to install the file on the device. diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 8a3e42393f5..3b18945b1a5 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -63,9 +63,9 @@ using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; -static inline QString msgProgress(int n, int total) +static inline QString msgProgress(int progress, int total) { - return BuildManager::tr("Finished %1 of %n build steps", 0, n).arg(total); + return BuildManager::tr("Finished %1 of %n build steps", 0, total).arg(progress); } BuildManager::BuildManager(ProjectExplorerPlugin *parent) @@ -102,6 +102,9 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent) connect(m_taskWindow, SIGNAL(tasksChanged()), this, SLOT(updateTaskCount())); + connect(m_taskWindow, SIGNAL(tasksCleared()), + this,SIGNAL(tasksCleared())); + connect(&m_progressWatcher, SIGNAL(canceled()), this, SLOT(cancel())); connect(&m_progressWatcher, SIGNAL(finished()), diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index 04565d5c96f..e622c294920 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -97,6 +97,8 @@ signals: void buildStateChanged(ProjectExplorer::Project *pro); void buildQueueFinished(bool success); void tasksChanged(); + void taskAdded(const ProjectExplorer::Task &task); + void tasksCleared(); private slots: void addToTaskWindow(const ProjectExplorer::Task &task); diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index f71f3cb23fd..3f7358f9d56 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -602,6 +602,7 @@ void TaskWindow::clearTasks(const QString &categoryId) d->m_model->clearTasks(categoryId); emit tasksChanged(); + emit tasksCleared(); navigateStateChanged(); } diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index d5a0f410c07..872f562b08d 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -78,6 +78,7 @@ public: signals: void tasksChanged(); + void tasksCleared(); private slots: void addCategory(const QString &categoryId, const QString &displayName); diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index 331e449955e..20d38fae38a 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -138,6 +138,9 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co QTextBlock block = begin.block(); + if (block.blockNumber() < m_editor->firstVisibleBlock().blockNumber() - 4) + block = m_editor->document()->findBlockByNumber(m_editor->firstVisibleBlock().blockNumber() - 4); + bool inSelection = false; QVector selection;