diff --git a/dist/changes-3.0.0 b/dist/changes-3.0.0 index 4f6cf897e31..233eb56d290 100644 --- a/dist/changes-3.0.0 +++ b/dist/changes-3.0.0 @@ -18,6 +18,10 @@ Editing are detected * Fixed issues with splitting when editor is not splittable (QTCREATORBUG-6827) * Added action for closing all editors except the visible ones (QTCREATORBUG-9893) + * Added support for changing case of entered values in snippets + (:u :c :l modifiers like for custom wizards) + * Fixed that proposal list would pop up again after it was dismissed with Esc key + right after it opened Managing and Building Projects * Fixed exit code that is shown for applications that are run in terminal @@ -35,6 +39,7 @@ QMake Projects * Fixed issues when using qtchooser (QTCREATORBUG-9841) * Fixed issues with autosave files triggering reparses (QTCREATORBUG-9957) * Fixed that run configurations were created for targets that are not built (QTCREATORBUG-9549) + * Fixed issue when renaming a file changes its MIME type (QTCREATORBUG-9824) CMake Projects * Added parser for CMake build errors @@ -42,16 +47,18 @@ CMake Projects * Added support for a CMakeDeployment.txt file that defines deployment rules Qbs Projects + * Added code completion support for code generated from .ui files Generic Projects Debugging + * Added Debuggers tab to Build & Run options + * Pretty printers (Python based, GDB and LLDB) + * Added QIPv6Address and support for IPv6 in QHostAddress * GDB - * Fixed various pretty printers * CDB * Fixed interrupting 32 bit processes from 64 bit Qt Creator builds * LLDB - * Fixed various pretty printers * QML Analyzer @@ -78,6 +85,15 @@ C++ Support * Added list of potential destinations when doing "Follow Symbol" on virtual function calls (QTCREATORBUG-9611) * Fixed "Follow Symbol" for operators (QTCREATORBUG-7485) + * Added logic to avoid complete project reparses (QTCREATORBUG-9730) + * Added matching against fully qualified name in C++ related locator filters + +Qt Quick Designer + * Added imports editor + * Fixed bread crumb bar for infile components + +Qt Designer + * Fixed "Go to slot" for form classes that are not part of a project (QTCREATORBUG-9653) Python Support @@ -85,11 +101,12 @@ GLSL Support * Fixed crash (QTCREATORBUG-10166) Diff Viewer - * Added button that switches between inline and side-by-side view + * Added button that switches between inline and side-by-side view (QTCREATORBUG-10035) * Added syntax highlighting (QTCREATORBUG-9580) Version Control Systems * Fixed crash when reverting changes while commit editor is open (QTCREATORBUG-10190) + * Fixed colors in description in submit editor * Added VCS topic to window title * Fixed that user was asked about adding file to VCS even if it already was in VCS (QTCREATORBUG-2455) @@ -113,6 +130,8 @@ Version Control Systems * ClearCase FakeVim + * Added shortcut for splitting editors + * Fixed scrolling when using single character or single line movement Platform Specific @@ -122,6 +141,8 @@ Qt Support QNX * Added check for existence of debug token and show error message in that case (QTCREATORBUG-9103) + * Added device auto-detection in "Add BlackBerry Device" wizard + * Added support for NDKs with multiple target configurations Android * Added error messages for incompatible devices to compile output (QTCREATORBUG-9690) diff --git a/doc/images/qtcreator-snippet-modifiers.png b/doc/images/qtcreator-snippet-modifiers.png new file mode 100644 index 00000000000..9d6f3657f7d Binary files /dev/null and b/doc/images/qtcreator-snippet-modifiers.png differ diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index f8d7a12f0c8..bb5a8a5100e 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -833,6 +833,29 @@ Use unique variable names within a snippet, because all instances of a variable are renamed when you specify a value for it. + To determine the case of values you enter in snippets, use the following + modifiers: + + \list + + \li \c {:c} converts the initial letter of the string to upper case + + \li \c {:l} converts the string to lower case + + \li \c {:u} converts the string to upper case + + \endlist + + For example, add the following line to the \c class snippet to specify that + the function name is converted to all lower case characters regardless of + how you specify the value of the \c{$name$} variable: + + \code + void $name:l$() {} + \endcode + + \image qtcreator-snippet-modifiers.png + The snippet editor does not check the syntax of the snippets that you edit or add. However, when you use the snippets, the code editor marks any errors by underlining them in red. diff --git a/scripts/hasCopyright.pl b/scripts/hasCopyright.pl index e8bb0b38789..3f7d4dc622e 100644 --- a/scripts/hasCopyright.pl +++ b/scripts/hasCopyright.pl @@ -63,7 +63,7 @@ while (1) { last if ($linecount > 50); $hasCopyright = 1 if $_ =~ /Copyright/i; - $hasCurrent = 1 if $_ =~ /\(c\).*\s2013/i; + $hasCurrent = 1 if $_ =~ /\(c\).*\s2014/i; $hasContact = 1 if $_ =~ /Contact: http:\/\/www.qt-project.org\/legal/; $hasCommercial = 1 if $_ =~ /Commercial (License )?Usage/; diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 2ab1b915449..d88bed7bdb7 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -185,6 +185,13 @@ def impl_SBValue__getitem__(value, index): return value.GetChildAtIndex(index) return value.GetChildMemberWithName(index) +def impl_SBValue__deref(value): + result = value.Dereference() + if result.IsValid(): + return result + result = value.CreateValueFromExpression(None, '*' + value.get_expr_path()) + return result + lldb.SBValue.__add__ = impl_SBValue__add__ lldb.SBValue.__sub__ = impl_SBValue__sub__ lldb.SBValue.__le__ = impl_SBValue__le__ @@ -196,7 +203,7 @@ lldb.SBValue.__long__ = lambda self: long(self.GetValue(), 0) lldb.SBValue.code = lambda self: self.GetTypeClass() lldb.SBValue.cast = lambda self, typeObj: self.Cast(typeObj) -lldb.SBValue.dereference = lambda self: self.Dereference() +lldb.SBValue.dereference = impl_SBValue__deref lldb.SBValue.address = property(lambda self: self.GetAddress()) lldb.SBType.pointer = lambda self: self.GetPointerType() @@ -625,10 +632,11 @@ class Dumper(DumperBase): self.remoteChannel_ = args.get('remoteChannel', '') self.platform_ = args.get('platform', '') - if self.sysRoot_: - self.debugger.SetCurrentPlatformSDKRoot(self.sysRoot_) if self.platform_: self.debugger.SetCurrentPlatform(self.platform_) + # sysroot has to be set *after* the platform + if self.sysRoot_: + self.debugger.SetCurrentPlatformSDKRoot(self.sysRoot_) self.target = self.debugger.CreateTarget(self.executable_, None, None, True, error) self.importDumpers() diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index e79ef3d47d3..4a9256c06ea 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -990,10 +990,12 @@ def qdumpHelper__Qt5_QMap(d, value, forceLong): innerType = nodeType - def helper(d, node, nodeType, isCompact, forceLong, i): + def helper(d, node, nodeType, isCompact, forceLong, i, n): left = node["left"] if not d.isNull(left): - i = helper(d, left.dereference(), nodeType, isCompact, forceLong, i) + i = helper(d, left.dereference(), nodeType, isCompact, forceLong, i, n) + if i >= n: + return i nodex = node.cast(nodeType) with SubItem(d, i): @@ -1008,16 +1010,18 @@ def qdumpHelper__Qt5_QMap(d, value, forceLong): qdump__QMapNode(d, nodex) i += 1 + if i >= n: + return i right = node["right"] if not d.isNull(right): - i = helper(d, right.dereference(), nodeType, isCompact, forceLong, i) + i = helper(d, right.dereference(), nodeType, isCompact, forceLong, i, n) return i with Children(d, n, childType=innerType): node = d_ptr["header"] - helper(d, node, nodeType, isCompact, forceLong, 0) + helper(d, node, nodeType, isCompact, forceLong, 0, n) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml index 1a79b72ac45..89ea883cc1c 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml @@ -92,5 +92,48 @@ Section { ExpandingSpacer { } } + + Label { + visible: majorQtQuickVersion > 1 + text: qsTr("Enabled") + } + SecondColumnLayout { + visible: majorQtQuickVersion > 1 + CheckBox { + backendValue: backendValues.enabled + text: qsTr("Accept mouse and keyboard events") + } + ExpandingSpacer { + } + } + + Label { + visible: majorQtQuickVersion > 1 + text: qsTr("Smooth") + } + SecondColumnLayout { + visible: majorQtQuickVersion > 1 + CheckBox { + backendValue: backendValues.smooth + text: qsTr("Smooth sampling active") + } + ExpandingSpacer { + } + } + + Label { + visible: majorQtQuickVersion > 1 + text: qsTr("Antialiasing") + } + SecondColumnLayout { + visible: majorQtQuickVersion > 1 + CheckBox { + backendValue: backendValues.antialiasing + text: qsTr("Anti-aliasing active") + } + ExpandingSpacer { + } + } + } } diff --git a/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick2controlsapplicationviewer/qtquick2controlsapplicationviewer.cpp b/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick2controlsapplicationviewer/qtquick2controlsapplicationviewer.cpp index 7198a903b41..bbce9d70bf5 100644 --- a/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick2controlsapplicationviewer/qtquick2controlsapplicationviewer.cpp +++ b/share/qtcreator/templates/shared/qtquickapplicationviewer/qtquick2controlsapplicationviewer/qtquick2controlsapplicationviewer.cpp @@ -34,7 +34,11 @@ class QtQuick2ApplicationViewerPrivate QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) { -#if defined(Q_OS_MAC) +#if defined(Q_OS_IOS) + if (!QDir::isAbsolutePath(path)) + return QString::fromLatin1("%1/%2") + .arg(QCoreApplication::applicationDirPath(), path); +#elif defined(Q_OS_MAC) if (!QDir::isAbsolutePath(path)) return QStringLiteral("%1/../Resources/%2") .arg(QCoreApplication::applicationDirPath(), path); diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 746587dd6e7..21312796dee 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -146,41 +146,6 @@ <html><head/><body><p>Попытка выполнить утилиту «%1» для приложения в режиме %2. Утилита разработана для использования в режиме %3.</p><p>Работа в режимах отладки и выпуска значительно отличается, поэтому проблемы, найденные для одного из них, могут отсутствовать у другого.</p><p>Выполнить запуск утилиты в режиме %2?</p></body></html> - - AnchorButtons - - Set top anchor - Установить верхнюю привязку - - - Setting anchors in states is not supported. - Установка привязок на состояния не поддерживается. - - - Set bottom anchor - Установить нижнюю привязку - - - Set left anchor - Установить левую привязку - - - Set right anchor - Установить правую привязку - - - Fill to parent - Заполнить предка - - - Set vertical anchor - Установить вертикальную привязку - - - Set horizontal anchor - Установить горизонтальную привязку - - Android @@ -2955,30 +2920,10 @@ Local pulls are not applied to the master branch. BorderImageSpecifics - - BorderImage - Изображение рамки - Source Источник - - Left - Слева - - - Right - Справа - - - Top - Сверху - - - Bottom - Снизу - Border Image Изображение рамки @@ -4309,63 +4254,6 @@ p, li { white-space: pre-wrap; } Стиль кода - - ColorGroupBox - - Color editor - Редактор цвета - - - Hue - Тон - - - Saturation - Насыщенность - - - Brightness - Яркость - - - Alpha - Альфа - - - - ColorLineEdit - - Translate this string - Перевести эту строку - - - - ColorTypeButtons - - Solid color - Сплошной цвет - - - Solid color (only editable in base state) - Сплошной цвет (меняется только в исходном состоянии) - - - Gradient - Градиент - - - Gradient (only editable in base state) - Градиент (меняется только в исходном состоянии) - - - Transparent - Прозрачность - - - Transparent (only editable in base state) - Прозрачность (меняется только в исходном состоянии) - - ColumnSpecifics @@ -12907,14 +12795,6 @@ Rebuilding the project might help. EditorManager - - Next Open Document in History - Следующий открытый документ в истории - - - Previous Open Document in History - Предыдущий открытый документ в истории - Go Back Перейти назад @@ -12954,47 +12834,6 @@ Rebuilding the project might help. Редактор - - ExpressionEditor - - Expression - Выражение - - - - Extended - - Effect - Эффект - - - Blur Radius: - Радиус размытия: - - - Pixel Size: - Размер пикселя: - - - x Offset: - Смещение по x: - - - y Offset: - Смещение по y: - - - - ExtendedFunctionButton - - Reset - Сбросить - - - Set Expression - Присвоить выражение - - ExtensionSystem::Internal::PluginDetailsView @@ -13941,53 +13780,6 @@ Reason: %3 Свернуть всё - - FlickableGroupBox - - Flickable - Толкаемо - - - Content size - Размер содержимого - - - Flick direction - Направление толкания - - - Flickable direction - Направление толкания - - - Bounds behavior - Поведение границ - - - Max. velocity - Макс. скорость - - - Maximum flick velocity - Максимальная скорость толкания - - - Flick deceleration - Замедление толкания - - - Behavior - Поведение - - - Interactive - Интерактивность - - - Deceleration - Замедление - - FlickableSection @@ -14044,10 +13836,6 @@ Reason: %3 Flow Перетекание - - Layout direction - Направление компоновки - Spacing Отступ @@ -14057,25 +13845,6 @@ Reason: %3 Направление компоновки - - FontGroupBox - - Font - Шрифт - - - Size - Размер - - - Font style - Начертание - - - Style - Стиль - - FontSection @@ -14337,33 +14106,6 @@ These files are preserved. - - Geometry - - Geometry - Геометрия - - - Position - Положение - - - Size - Размер - - - Width - Ширина - - - Height - Высота - - - Lock aspect ratio - Зафиксировать соотношение сторон - - GeometrySection @@ -16650,10 +16392,6 @@ You can choose between stashing the changes or discarding them. Flow Перетекание - - Layout direction - Направление компоновки - Spacing Отступ @@ -16677,14 +16415,6 @@ You can choose between stashing the changes or discarding them. Cache buffer Буфер кэша - - Cell height - Высота ячейки - - - Cell width - Ширина ячейки - Determines whether the grid wraps key navigation. Определяет, меняет ли сетка навигацию клавишами. @@ -17612,6 +17342,10 @@ Ids must begin with a lowercase letter. Ios::Internal::IosDebugSupport + + Could not find device specific debug symbols at %1. Debugging initialization will be slow until you open the Organizer window of Xcode with the device connected to have the symbols generated. + Не удалось найти отладочные символы для устройства в %1. Инициализация отладки займёт много времени. Для её ускорения необходимо подключить устройство и открыть окно органайзера Xcode для генерации символов. + Could not get debug server file descriptor. Не удалось получить дескриптор файла сервера отладки. @@ -17718,6 +17452,10 @@ Ids must begin with a lowercase letter. unknown неизвестно + + OS version + Версия ОС + An iOS device in user mode has been detected. Обнаружено устройство iOS работающее в пользовательском режиме. @@ -17895,33 +17633,6 @@ QML component instance objects and properties directly. QML. - - Layout - - Layout - Компоновка - - - Anchors - Привязки - - - Set anchors - Установить привязки - - - Setting anchors in states is not supported. - Установка привязок на состояния не поддерживается. - - - Target - Цель - - - Margin - Отступ - - LayoutSection @@ -17941,13 +17652,6 @@ QML. Отступ - - LineEdit - - Translate this string - Перевести эту строку - - LinksBar @@ -18021,14 +17725,6 @@ QML. Resize animation duration of the highlight delegate. Продолжительность анимации изменения размера делегата подсветки. - - Resize speed - Скорость изменения размера - - - Resize animation speed of the highlight delegate. - Скорость анимации изменения размера делегата подсветки. - Preferred begin Предпочтительное начало @@ -19171,27 +18867,8 @@ Do you want to kill it? Встроенный в Qt Creator - - Modifiers - - Manipulation - Управление - - - Rotation - Вращение - - - z - - - MouseAreaSpecifics - - MouseArea - - Enabled Включено @@ -25159,11 +24836,23 @@ Neither the path to the library nor the path to its includes is added to the .pr The name of the release build configuration created by default for a qmake project. Выпуск + + Release + Shadow build directory suffix + Non-ASCII characters in directory suffix may cause build issues. + Release + Debug The name of the debug build configuration created by default for a qmake project. Отладка + + Debug + Shadow build directory suffix + Non-ASCII characters in directory suffix may cause build issues. + Debug + Build Сборка @@ -29160,12 +28849,12 @@ Do you want Qt Creator to generate it for your project? %1 - Target is being added. - Цель была добавлена. + Target %1 is being added. + Добавляется цель %1. - Target is already added. - Цель уже добавлена. + Target %1 is already added. + Цель %1 уже добавлена. Finished uninstalling target: @@ -30769,43 +30458,8 @@ cannot be found in the path. Фокус при нажатии - - RectangleColorGroupBox - - Colors - Цвета - - - Stops - Опорные точки - - - Gradient stops - Опорные точки градиента - - - Rectangle - Прямоугольник - - - Border - Рамка - - RectangleSpecifics - - Rectangle - Прямоугольник - - - Border width - Ширина рамки - - - Border has to be solid to change width - Для изменения ширины необходимо, чтобы рамка была сплошной - Radius Радиус @@ -31767,10 +31421,6 @@ Remote stderr was: '%1' Row Строка - - Layout direction - Направление компоновки - Spacing Отступ @@ -31900,47 +31550,12 @@ with a password, which you can enter below. Не кодировать файл ключа - - StandardTextColorGroupBox - - Color - Цвет - - - Text - Текст - - - Style - Стиль - - - Selection - Выделение - - - Selected - Выделено - - StandardTextGroupBox - - Text - Текст - - - Wrap mode - Режим переноса - - - Alignment - Выравнивание - StandardTextSection @@ -32288,25 +31903,6 @@ with a password, which you can enter below. Фиксация Subversion - - Switches - - Special properties - Специальные свойства - - - Layout - Компоновка - - - Advanced properties - Дополнительные свойства - - - Advanced - Дополнительно - - TabViewToolAction @@ -32436,10 +32032,6 @@ with a password, which you can enter below. TextEditSpecifics - - Text Edit - Текстовый редактор - Format Формат @@ -32463,10 +32055,6 @@ with a password, which you can enter below. Text Editor Текстовый редактор - - Translate this string - Перевести эту строку - TextEditor::BaseFileFind @@ -34517,49 +34105,6 @@ Will not be applied to whitespace in comments and strings. Определяет, как текст отображается в поле. - - TextInputGroupBox - - Text Input - Текстовый ввод - - - Input mask - Маска ввода - - - Echo mode - Режим эха - - - Pass. char - Символ пароля - - - Character displayed when users enter passwords. - Символ отображаемый при вводе пользователем паролей. - - - Read only - Только для чтения - - - Cursor visible - Курсор виден - - - Active focus on press - Активировать фокус при нажатии - - - Auto scroll - Прокручивать автоматически - - - Flags - Флаги - - TextInputSection @@ -34763,72 +34308,6 @@ Will not be applied to whitespace in comments and strings. &Закрыть - - Transformation - - Transformation - Преобразование - - - Origin - Начало - - - Top - Верхний - - - Top left - Верхний левый - - - Top right - Верхний правый - - - Left - Левый - - - Center - Центральный - - - Right - Правый - - - Bottom left - Нижний левый - - - Bottom right - Нижний правый - - - Bottom - Нижний - - - Scale - Масштаб - - - Rotation - Вращение - - - - Type - - Type - Тип - - - Id - - - Update @@ -37174,68 +36653,6 @@ should a repository require SSH-authentication (see documentation on SSH and the ... поиск переопределений - - Visibility - - Visibility - Видимость - - - Visible - Виден - - - isVisible - - - - Smooth - Сглаживание - - - Clip - Обрезка - - - Opacity - Непрозрачность - - - - WebViewSpecifics - - WebView - - - - URL - URL - - - Pref Width - Желаемая ширина - - - Preferred Width - Оптимальная ширина - - - Pref Height - Желаемая высота - - - Preferred Height - Желаемая высота - - - Scale - Масштаб - - - Contents Scale - Масштаб содержимого - - Welcome::Internal::CommunityWelcomePage @@ -37273,17 +36690,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Файл «%1» не является модулем QmlDesigner. - - WindowPane - - Window - Окно - - - Title - Заголовок - - WindowSpecifics diff --git a/src/app/Info.plist.in b/src/app/Info.plist.in index 290a4e7bc73..6bbfcc3a020 100644 --- a/src/app/Info.plist.in +++ b/src/app/Info.plist.in @@ -4,6 +4,8 @@ NSPrincipalClass NSApplication + NSSupportsAutomaticGraphicsSwitching + CFBundleDocumentTypes diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index 9d8695cb5a8..7c3374795fd 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -283,7 +283,7 @@ unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestin process.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments); if (!process.waitForFinished(5000) || process.exitCode() != 0) - return -1; + return 0; QByteArray output = process.readAll(); output.replace("\r\n", "\n"); QList lines = output.split('\n'); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 07b03abf3c9..5d31975ed5e 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1077,9 +1077,8 @@ void MainWindow::readSettings() QColor(Utils::StyleHelper::DEFAULT_BASE_COLOR)).value()); } - if (!restoreGeometry(m_settings->value(QLatin1String(windowGeometryKey)).toByteArray())) - resize(1008, 700); // size without window decoration - restoreState(m_settings->value(QLatin1String(windowStateKey)).toByteArray()); + // Delay restoreWindowState, since it is overridden by LayoutRequest event + QTimer::singleShot(0, this, SLOT(restoreWindowState())); bool modeSelectorVisible = m_settings->value(QLatin1String(modeSelectorVisibleKey), true).toBool(); ModeManager::setModeSelectorVisible(modeSelectorVisible); @@ -1262,3 +1261,12 @@ bool MainWindow::showWarningWithOptions(const QString &title, return showOptionsDialog(settingsCategory, settingsId); return false; } + +void MainWindow::restoreWindowState() +{ + m_settings->beginGroup(QLatin1String(settingsGroup)); + if (!restoreGeometry(m_settings->value(QLatin1String(windowGeometryKey)).toByteArray())) + resize(1008, 700); // size without window decoration + restoreState(m_settings->value(QLatin1String(windowStateKey)).toByteArray()); + m_settings->endGroup(); +} diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 93cbf6a0268..323ad67de10 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -149,6 +149,7 @@ private slots: void setSidebarVisible(bool visible); void destroyVersionDialog(); void openDelayedFiles(); + void restoreWindowState(); private: void updateContextObject(const QList &context); diff --git a/src/plugins/cpptools/includeutils.cpp b/src/plugins/cpptools/includeutils.cpp index 3d697974e7f..17bbf5c3190 100644 --- a/src/plugins/cpptools/includeutils.cpp +++ b/src/plugins/cpptools/includeutils.cpp @@ -423,7 +423,7 @@ int IncludeGroup::lineForNewInclude(const QString &newIncludeFileName, return -1; if (isSorted()) { - const Include newInclude(newIncludeFileName, QString(), -1, newIncludeType); + const Include newInclude(newIncludeFileName, QString(), 0, newIncludeType); const QList::const_iterator it = std::lower_bound(m_includes.begin(), m_includes.end(), newInclude, includeFileNamelessThen); if (it == m_includes.end()) diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp index 83fa67abe69..1897527e49e 100644 --- a/src/plugins/debugger/debuggerprotocol.cpp +++ b/src/plugins/debugger/debuggerprotocol.cpp @@ -56,7 +56,7 @@ uchar fromhex(uchar c) return 10 + c - 'a'; if (c >= 'A' && c <= 'Z') return 10 + c - 'A'; - return -1; + return UCHAR_MAX; } void skipCommas(const char *&from, const char *to) @@ -147,7 +147,7 @@ QByteArray GdbMi::parseCString(const char *&from, const char *to) uchar prod = 0; while (true) { uchar val = fromhex(c); - if (val == uchar(-1)) + if (val == UCHAR_MAX) break; prod = prod * 16 + val; if (++chars == 3 || src == end) diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 86d3c673f96..dd5ed64d51d 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -49,8 +49,7 @@ using namespace Utils; #if defined(Q_OS_WIN) static const char* qtBuildPaths[] = { "Q:/qt5_workdir/w/s", - "C:/iwmake/build_mingw_opensource", - "C:/ndk_buildrepos/qt-desktop/src"}; + "C:/work/build/qt5_workdir/w/s"}; #elif defined(Q_OS_MAC) static const char* qtBuildPaths[] = {}; #else diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index 52d1054b0a7..17dc02a7b62 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -86,6 +86,7 @@ public: DebuggerEngineType secondSlaveEngineType; DebuggerEngineType cppEngineType; QString sysRoot; + QString deviceSymbolsRoot; QString debuggerCommand; ProjectExplorer::Abi toolChainAbi; ProjectExplorer::IDevice::ConstPtr device; diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 9b8d686f105..624200d840e 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -208,7 +208,7 @@ void LldbEngine::setupInferior() QTC_CHECK(sp.attachPID <= 0 || (sp.startMode == AttachCrashedExternal || sp.startMode == AttachExternal)); cmd.arg("attachPid", sp.attachPID); - cmd.arg("sysRoot", sp.sysRoot); + cmd.arg("sysRoot", sp.deviceSymbolsRoot.isEmpty() ? sp.sysRoot : sp.deviceSymbolsRoot); cmd.arg("remoteChannel", ((sp.startMode == AttachToRemoteProcess || sp.startMode == AttachToRemoteServer) ? sp.remoteChannel : QString())); diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp index ec82d9c280b..ed9ee112459 100644 --- a/src/plugins/debugger/qml/qmllivetextpreview.cpp +++ b/src/plugins/debugger/qml/qmllivetextpreview.cpp @@ -642,7 +642,7 @@ void QmlLiveTextPreview::editorContentsChanged() void QmlLiveTextPreview::onAutomaticUpdateFailed() { - showSyncWarning(AutomaticUpdateFailed, QString(), -1, -1); + showSyncWarning(AutomaticUpdateFailed, QString(), UINT_MAX, UINT_MAX); } QList QmlLiveTextPreview::objectReferencesForOffset(quint32 offset) diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp index 71904f1ac47..4b068a9cade 100644 --- a/src/plugins/debugger/registerhandler.cpp +++ b/src/plugins/debugger/registerhandler.cpp @@ -293,7 +293,7 @@ static int bitWidthFromType(int type, int subType) return 0; } -static const int TopLevelId = -1; +static const uint TopLevelId = UINT_MAX; static bool isTopLevelItem(const QModelIndex &index) { return quintptr(index.internalId()) == quintptr(TopLevelId); diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp index 4b82e207e57..174ea9bd9cc 100644 --- a/src/plugins/ios/iosdebugsupport.cpp +++ b/src/plugins/ios/iosdebugsupport.cpp @@ -31,6 +31,7 @@ #include "iosrunner.h" #include "iosmanager.h" +#include "iosdevice.h" #include #include @@ -40,10 +41,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -73,11 +76,38 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi if (device.isNull()) return 0; QmakeProject *project = static_cast(target->project()); + Kit *kit = target->kit(); DebuggerStartParameters params; if (device->type() == Core::Id(Ios::Constants::IOS_DEVICE_TYPE)) { params.startMode = AttachToRemoteProcess; params.platform = QLatin1String("remote-ios"); + IosDevice::ConstPtr iosDevice = device.dynamicCast(); + if (iosDevice.isNull()) + return 0; + QString osVersion = iosDevice->osVersion(); + Utils::FileName deviceSdk1 = Utils::FileName::fromString(QDir::homePath() + + QLatin1String("/Library/Developer/Xcode/iOS DeviceSupport/") + + osVersion + QLatin1String("/Symbols")); + QString deviceSdk; + if (deviceSdk1.toFileInfo().isDir()) { + deviceSdk = deviceSdk1.toString(); + } else { + Utils::FileName deviceSdk2 = IosConfigurations::developerPath() + .appendPath(QLatin1String("Platforms/iPhoneOS.platform/DeviceSupport/")) + .appendPath(osVersion).appendPath(QLatin1String("Symbols")); + if (deviceSdk2.toFileInfo().isDir()) { + deviceSdk = deviceSdk2.toString(); + } else { + TaskHub::addTask(Task::Warning, tr( + "Could not find device specific debug symbols at %1. " + "Debugging initialization will be slow until you open the Organizer window of " + "Xcode with the device connected to have the symbols generated.") + .arg(deviceSdk1.toUserOutput()), + ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT); + } + } + params.deviceSymbolsRoot = deviceSdk; } else { params.startMode = AttachExternal; params.platform = QLatin1String("ios-simulator"); @@ -91,7 +121,6 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi = runConfig->extraAspect(); if (aspect->useCppDebugger()) { params.languages |= CppLanguage; - Kit *kit = target->kit(); params.sysRoot = SysRootKitInformation::sysRoot(kit).toString(); params.debuggerCommand = DebuggerKitInformation::debuggerCommand(kit).toString(); if (ToolChain *tc = ToolChainKitInformation::toolChain(kit)) diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index a9753cadb11..ba4631be823 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -190,21 +190,11 @@ QString IosDevice::name() return QCoreApplication::translate("Ios::Internal::IosDevice", "iOS Device"); } -/* -// add back? - -QString IosDevice::cpuArchitecure() const +QString IosDevice::osVersion() const { - return m_extraInfo.value(QLatin1String("deviceInfo")).toMap() - .value(QLatin1String("CPUArchitecture")).toString(); + return m_extraInfo.value(QLatin1String("osVersion")); } -QString IosDevice::productType() const -{ - return m_extraInfo.value(QLatin1String("deviceInfo")).toMap() - .value(QLatin1String("ProductType")).toString(); -}*/ - // IosDeviceManager @@ -222,6 +212,7 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap() tMap[QLatin1String("NO")] = tr("no"); tMap[QLatin1String("YES")] = tr("yes"); tMap[QLatin1String("*unknown*")] = tr("unknown"); + tMap[QLatin1String("osVersion")] = tr("OS version"); translationMap = &tMap; return tMap; } diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h index f480f3a62f9..a0f9456ec7e 100644 --- a/src/plugins/ios/iosdevice.h +++ b/src/plugins/ios/iosdevice.h @@ -65,9 +65,7 @@ public: QVariantMap toMap() const; QString uniqueDeviceID() const; IosDevice(const QString &uid); - // add back? currently unused... - //QString cpuArchitecure() const; - //QString productType() const; + QString osVersion() const; static QString name(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index fde3f3ef14f..75cf14f7ef7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -40,6 +40,7 @@ PropertyEditorContextObject::PropertyEditorContextObject(QObject *parent) : m_backendValues(0), m_majorVersion(-1), m_minorVersion(-1), + m_majorQtQuickVersion(-1), m_qmlComponent(0), m_qmlContext(0) { @@ -52,6 +53,11 @@ int PropertyEditorContextObject::majorVersion() const } +int PropertyEditorContextObject::majorQtQuickVersion() const +{ + return m_majorQtQuickVersion; +} + void PropertyEditorContextObject::setMajorVersion(int majorVersion) { if (m_majorVersion == majorVersion) @@ -62,6 +68,17 @@ void PropertyEditorContextObject::setMajorVersion(int majorVersion) emit majorVersionChanged(); } +void PropertyEditorContextObject::setMajorQtQuickVersion(int majorVersion) +{ + if (m_majorQtQuickVersion == majorVersion) + return; + + m_majorQtQuickVersion = majorVersion; + + emit majorQtQuickVersionChanged(); + +} + int PropertyEditorContextObject::minorVersion() const { return m_minorVersion; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h index 0c5e4a5690a..22ec4d44f9d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h @@ -53,6 +53,7 @@ class PropertyEditorContextObject : public QObject Q_PROPERTY(int majorVersion READ majorVersion WRITE setMajorVersion NOTIFY majorVersionChanged) Q_PROPERTY(int minorVersion READ minorVersion WRITE setMinorVersion NOTIFY minorVersionChanged) + Q_PROPERTY(int majorQtQuickVersion READ majorQtQuickVersion WRITE setMajorQtQuickVersion NOTIFY majorQtQuickVersionChanged) Q_PROPERTY(QQmlPropertyMap* backendValues READ backendValues WRITE setBackendValues NOTIFY backendValuesChanged) @@ -74,7 +75,9 @@ public: Q_INVOKABLE QString convertColorToString(const QColor &color) { return color.name(); } int majorVersion() const; + int majorQtQuickVersion() const; void setMajorVersion(int majorVersion); + void setMajorQtQuickVersion(int majorVersion); int minorVersion() const; void setMinorVersion(int minorVersion); @@ -91,6 +94,7 @@ signals: void backendValuesChanged(); void majorVersionChanged(); void minorVersionChanged(); + void majorQtQuickVersionChanged(); void specificQmlComponentChanged(); public slots: @@ -124,6 +128,7 @@ private: int m_majorVersion; int m_minorVersion; + int m_majorQtQuickVersion; QQmlComponent *m_qmlComponent; QQmlContext *m_qmlContext; }; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 25cdc1cd696..12f74c52185 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -290,8 +290,10 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q } else { contextObject()->setMajorVersion(-1); contextObject()->setMinorVersion(-1); + contextObject()->setMajorQtQuickVersion(-1); } + contextObject()->setMajorQtQuickVersion(qmlObjectNode.view()->majorQtQuickVersion()); } else { qWarning() << "PropertyEditor: invalid node for setup"; } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index f209cf8b237..126be7ad71a 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -240,6 +240,9 @@ void PropertyEditorView::changeExpression(const QString &propertyName) if (m_locked) return; + if (!m_selectedNode.isValid()) + return; + RewriterTransaction transaction = beginRewriterTransaction(QByteArrayLiteral("PropertyEditorView::changeExpression")); try { diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h index 4f4a20e38f6..0a6b63d9c16 100644 --- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h @@ -86,6 +86,8 @@ public: QList superClasses() const; NodeMetaInfo directSuperClass() const; + QList superClassNames() const; + bool defaultPropertyIsComponent() const; TypeName typeName() const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index b8b61ceb2bd..c18576e3994 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1031,12 +1031,27 @@ void NodeMetaInfoPrivate::setupPrototypes() description.majorVersion = qmlValue->componentVersion().majorVersion(); LanguageUtils::FakeMetaObject::Export qtquickExport = qmlValue->metaObject()->exportInPackage("QtQuick"); LanguageUtils::FakeMetaObject::Export cppExport = qmlValue->metaObject()->exportInPackage(""); - if (qtquickExport.isValid()) + + if (qtquickExport.isValid()) { description.className = qtquickExport.package.toUtf8() + '.' + qtquickExport.type.toUtf8(); - else if (qmlValue->moduleName().isEmpty() && cppExport.isValid()) - description.className = cppExport.package.toUtf8() + '.' + cppExport.type.toUtf8(); - else if (!qmlValue->moduleName().isEmpty()) - description.className = qmlValue->moduleName().toUtf8() + '.' + description.className; + } else { + bool found = false; + if (cppExport.isValid()) { + foreach (const LanguageUtils::FakeMetaObject::Export &exportValue, qmlValue->metaObject()->exports()) { + if (exportValue.package.toUtf8() != "") { + found = true; + description.className = exportValue.package.toUtf8() + '.' + exportValue.type.toUtf8(); + } + } + } + if (!found) { + if (qmlValue->moduleName().isEmpty() && cppExport.isValid()) { + description.className = cppExport.package.toUtf8() + '.' + cppExport.type.toUtf8(); + } else if (!qmlValue->moduleName().isEmpty()) { + description.className = qmlValue->moduleName().toUtf8() + '.' + description.className; + } + } + } m_prototypes.append(description); } else { if (context()->lookupType(document(), QStringList() << ov->className())) { @@ -1233,6 +1248,16 @@ NodeMetaInfo NodeMetaInfo::directSuperClass() const return NodeMetaInfo(); } +QList NodeMetaInfo::superClassNames() const +{ + QList list; + + foreach (const Internal::TypeDescription &type, m_privateData->prototypes()) { + list.append(type.className); + } + return list; +} + bool NodeMetaInfo::defaultPropertyIsComponent() const { if (hasDefaultProperty()) diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 164e91c6d63..df9adf3238c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -471,12 +471,14 @@ void QmlProfilerTraceView::profilerDataModelStateChanged() switch (d->m_modelManager->state()) { case QmlProfilerDataState::Empty: break; case QmlProfilerDataState::ClearingData: + d->m_mainView->hide(); emit enableToolbar(false); break; case QmlProfilerDataState::AcquiringData: break; case QmlProfilerDataState::ProcessingData: break; case QmlProfilerDataState::Done: emit enableToolbar(true); + d->m_mainView->show(); break; default: break; diff --git a/src/plugins/qnx/blackberryinstallwizardpages.cpp b/src/plugins/qnx/blackberryinstallwizardpages.cpp index 8ca8986820e..207b8b29d71 100644 --- a/src/plugins/qnx/blackberryinstallwizardpages.cpp +++ b/src/plugins/qnx/blackberryinstallwizardpages.cpp @@ -487,11 +487,11 @@ void BlackBerryInstallWizardFinalPage::initializePage() return; } - label->setText(tr("Target is being added.").arg(m_data.ndkPath)); + label->setText(tr("Target %1 is being added.").arg(m_data.ndkPath)); emit done(); return; } else { - label->setText(tr("Target is already added.").arg(m_data.ndkPath)); + label->setText(tr("Target %1 is already added.").arg(m_data.ndkPath)); return; } } diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 1f0f8c956d1..e1f4e8a8784 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -174,7 +174,7 @@ public slots: ExamplesListModel::ExamplesListModel(QObject *parent) : QAbstractListModel(parent), - m_uniqueQtId(noQtVersionsId) + m_uniqueQtId(uniqueQtVersionIdSetting()) { QHash roleNames; roleNames[Name] = "name"; diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index a586f423935..d52b042d1b9 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -246,12 +246,13 @@ QDomDocument UpdateInfoPlugin::update() QDomDocument updates; if (updater.exitStatus() != QProcess::CrashExit) { d->m_timer.stop(); - d->m_lastDayChecked = QDate::currentDate(); updates.setContent(updater.readAllStandardOutput()); saveSettings(); // force writing out the last update date } else { qWarning() << "Updater application crashed."; } + + d->m_lastDayChecked = QDate::currentDate(); return updates; } diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp index 3bc83bb0274..ce61347c610 100644 --- a/src/tools/iostool/iosdevicemanager.cpp +++ b/src/tools/iostool/iosdevicemanager.cpp @@ -1227,6 +1227,7 @@ void DevInfoSession::deviceCallbackReturned() QString deviceNameKey = QLatin1String("deviceName"); QString developerStatusKey = QLatin1String("developerStatus"); QString deviceConnectedKey = QLatin1String("deviceConnected"); + QString osVersionKey = QLatin1String("osVersion"); bool failure = !device; if (!failure) { failure = !connectDevice(); @@ -1256,6 +1257,32 @@ void DevInfoSession::deviceCallbackReturned() if (!res.contains(developerStatusKey)) res[developerStatusKey] = QLatin1String("*off*"); } + if (!failure) { + CFPropertyListRef cfProductVersion = lib()->deviceCopyValue(device, + 0, + CFSTR("ProductVersion")); + //CFShow(cfProductVersion); + CFPropertyListRef cfBuildVersion = lib()->deviceCopyValue(device, + 0, + CFSTR("BuildVersion")); + //CFShow(cfBuildVersion); + QString versionString; + if (cfProductVersion) { + if (CFGetTypeID(cfProductVersion) == CFStringGetTypeID()) + versionString = CFStringRef2QString(reinterpret_cast(cfProductVersion)); + CFRelease(cfProductVersion); + } + if (cfBuildVersion) { + if (!versionString.isEmpty() && CFGetTypeID(cfBuildVersion) == CFStringGetTypeID()) + versionString += QString::fromLatin1(" (%1)").arg( + CFStringRef2QString(reinterpret_cast(cfBuildVersion))); + CFRelease(cfBuildVersion); + } + if (!versionString.isEmpty()) + res[osVersionKey] = versionString; + else + res[osVersionKey] = QLatin1String("*unknown*"); + } disconnectDevice(); } if (!res.contains(deviceConnectedKey)) diff --git a/src/tools/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet.pro index baa1e729239..ca6ad0a8dcc 100644 --- a/src/tools/qmlpuppet/qmlpuppet.pro +++ b/src/tools/qmlpuppet/qmlpuppet.pro @@ -4,7 +4,7 @@ include(../../../qtcreator.pri) include(../../private_headers.pri) greaterThan(QT_MAJOR_VERSION, 4) { - qtHaveModule(declarative) { + qtHaveModule(declarative-private) { QT += declarative-private core-private SUBDIRS += qmlpuppet } diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 2d98cbef23e..a685f4b76c1 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -3311,6 +3311,7 @@ namespace lambda { std::string x; auto f = [&] () -> const std::string & { int z = x.size(); + Q_UNUSED(z); return x; }; auto c = f(); diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 634269cc6d1..b814680f8dd 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -456,8 +456,8 @@ def __closeSubprocessByPushingStop__(sType): stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") if stopButton.enabled: clickButton(stopButton) - test.verify(playButton.enabled) - test.compare(stopButton.enabled, False) + test.verify(waitFor("playButton.enabled", 5000), "Play button should be enabled") + test.compare(stopButton.enabled, False, "Stop button should be disabled") if sType == SubprocessType.QT_QUICK_UI and platform.system() == "Darwin": waitFor("stopButton.enabled==False") snooze(2) diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 76e947c0261..290d622ce7a 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -60,15 +60,19 @@ source("../../shared/workarounds.py") # function must be called BEFORE any call except the first (which is done always automatically) def overrideStartApplication(): global startApplication, __origStartApplication__ - if (platform.system() != "Darwin"): + if (platform.system() == "Linux"): return if (__origStartApplication__ == None): __origStartApplication__ = startApplication def startApplication(*args): args = list(args) if str(args[0]).startswith('qtcreator'): - args[0] = args[0].replace('qtcreator', '"Qt Creator"', 1) - test.log("Using workaround for MacOS (different AUT name)") + if platform.system() == 'Darwin': + args[0] = args[0].replace('qtcreator', '"Qt Creator"', 1) + test.log("Using workaround for MacOS (different AUT name)") + elif not isQt4Build: + args[0] = args[0] + ' -platform windows:dialogs=none' + test.log("Using workaround for Windows (failing to hook into native FileDialog)") return __origStartApplication__(*args) def startedWithoutPluginError(): diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py index 656b29863ee..a7f5a5dde8b 100644 --- a/tests/system/suite_tools/tst_git_clone/test.py +++ b/tests/system/suite_tools/tst_git_clone/test.py @@ -53,9 +53,11 @@ def verifyCloneLog(targetDir, canceled): "Searching for clone directory in clone log") result = "The process terminated with exit code 0." summary = "Succeeded." + # cloneLog.plainText holds escape as character which makes QDom fail while printing the result + # removing these for letting Jenkins continue execute the test suite test.xverify((result in str(cloneLog.plainText)), "Searching for result (%s) in clone log:\n%s" - % (result, str(cloneLog.plainText))) + % (result, str(cloneLog.plainText).replace(unicode("\x1b"), ""))) test.compare(waitForObject(":Git Repository Clone.Result._QLabel").text, summary) def verifyFiles(targetDir):