From be74891757265dc0f95ae77b39345fedef520365 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mar 04 2024 13:03:05 +0000 Subject: Update to 13.0.0-beta2 --- diff --git a/.gitignore b/.gitignore index 28a75ae..be1d70a 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ /qt-creator-opensource-src-12.0.0.tar.xz /qt-creator-opensource-src-12.0.1.tar.xz /qt-creator-opensource-src-12.0.2.tar.xz +/qt-creator-opensource-src-13.0.0-beta2.tar.xz diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs index c5cca96..470bf7f 100644 --- a/qt-creator-Fedora-privlibs +++ b/qt-creator-Fedora-privlibs @@ -31,7 +31,9 @@ %global privlibs %{privlibs}|libDesigner %global privlibs %{privlibs}|libDiffEditor %global privlibs %{privlibs}|libDocker +%global privlibs %{privlibs}|libEffectComposer %global privlibs %{privlibs}|libEmacsKeys +%global privlibs %{privlibs}|libExtensionManager %global privlibs %{privlibs}|libExtensionSystem %global privlibs %{privlibs}|libFakeVim %global privlibs %{privlibs}|libFossil @@ -58,6 +60,7 @@ %global privlibs %{privlibs}|libMesonProjectManager %global privlibs %{privlibs}|libModelEditor %global privlibs %{privlibs}|libModeling +%global privlibs %{privlibs}|libNanotrace %global privlibs %{privlibs}|libNim %global privlibs %{privlibs}|libPerfProfiler %global privlibs %{privlibs}|libPerforce @@ -77,6 +80,7 @@ %global privlibs %{privlibs}|libQmlProfiler %global privlibs %{privlibs}|libQmlProjectManager %global privlibs %{privlibs}|libQnx +%global privlibs %{privlibs}|libQtApplicationManagerIntegration %global privlibs %{privlibs}|libQtSupport %global privlibs %{privlibs}|libRemoteLinux %global privlibs %{privlibs}|libResourceEditor @@ -105,4 +109,5 @@ %global privlibs %{privlibs}|libcomponentsplugin %global privlibs %{privlibs}|libqlitehtml %global privlibs %{privlibs}|libqmlpreviewplugin +%global privlibs %{privlibs}|libqtkeychain %global privlibs %{privlibs}|libqtquickplugin diff --git a/qt-creator-debuginfod.patch b/qt-creator-debuginfod.patch index f02dedf..30a1872 100644 --- a/qt-creator-debuginfod.patch +++ b/qt-creator-debuginfod.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/cmake/Findelfutils.cmake qt-creator-opensource-src-12.0.1-new/cmake/Findelfutils.cmake ---- qt-creator-opensource-src-12.0.1/cmake/Findelfutils.cmake 2023-12-11 02:09:57.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/cmake/Findelfutils.cmake 2024-02-03 13:27:44.025591187 +0100 +diff -rupN --no-dereference qt-creator-opensource-src-13.0.0-beta2/cmake/Findelfutils.cmake qt-creator-opensource-src-13.0.0-beta2-new/cmake/Findelfutils.cmake +--- qt-creator-opensource-src-13.0.0-beta2/cmake/Findelfutils.cmake 2024-02-28 05:02:18.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/cmake/Findelfutils.cmake 2024-03-04 10:41:45.825694098 +0100 @@ -32,7 +32,7 @@ find_path(ELFUTILS_INCLUDE_DIR "${ELFUTILS_INSTALL_DIR}" ENV ELFUTILS_INSTALL_DIR "${CMAKE_PREFIX_PATH}" ) diff --git a/qt-creator-litehtml.patch b/qt-creator-litehtml.patch deleted file mode 100644 index b5f55f2..0000000 --- a/qt-creator-litehtml.patch +++ /dev/null @@ -1,588 +0,0 @@ -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/container_qpainter.cpp qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/container_qpainter.cpp ---- qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/container_qpainter.cpp 2023-12-11 02:10:02.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/container_qpainter.cpp 2024-02-03 13:27:45.061587766 +0100 -@@ -48,9 +48,11 @@ static QRect toQRect(litehtml::position - return {position.x, position.y, position.width, position.height}; - } - --static litehtml::elements_vector path(const litehtml::element::ptr &element) -+typedef std::vector> litehtml_elements_vector; -+ -+static litehtml_elements_vector path(const litehtml::element::ptr &element) - { -- litehtml::elements_vector result; -+ litehtml_elements_vector result; - litehtml::element::ptr current = element; - while (current) { - result.push_back(current); -@@ -60,8 +62,8 @@ static litehtml::elements_vector path(co - return result; - } - --static std::pair getCommonParent(const litehtml::elements_vector &a, -- const litehtml::elements_vector &b) -+static std::pair getCommonParent(const litehtml_elements_vector &a, -+ const litehtml_elements_vector &b) - { - litehtml::element::ptr parent; - const size_t minSize = std::min(a.size(), b.size()); -@@ -81,8 +83,8 @@ static std::pairget_children_count()); ++i) { -- const litehtml::element::ptr child = commonParent->get_child(i); -+ litehtml_elements_vector children{commonParent->children().begin(), commonParent->children().end()}; -+ for (int i = 0, n = int(children.size()); i < n; ++i) { -+ const litehtml::element::ptr child = children.at(i); - if (child == aBranch) - return {a, b}; - if (child == bBranch) -@@ -110,8 +113,9 @@ static std::pairget_children_count()); ++i) -- if (parent->get_child(i) == child) -+ litehtml_elements_vector children{parent->children().begin(), parent->children().end()}; -+ for (int i = 0, n = int(children.size()); i < n; ++i) -+ if (children.at(i) == child) - return i; - return -1; - } -@@ -124,8 +128,8 @@ static litehtml::element::ptr firstLeaf( - if (element == stop) - return element; - litehtml::element::ptr current = element; -- while (current != stop && current->get_children_count() > 0) -- current = current->get_child(0); -+ while (current != stop && current->children().size() > 0) -+ current = *(current->children().begin()); - return current; - } - -@@ -138,7 +142,7 @@ static litehtml::element::ptr nextLeaf(c - if (element == stop) - return element; - litehtml::element::ptr current = element; -- if (current->have_parent()) { -+ if (!current->is_root()) { - // find next sibling - const litehtml::element::ptr parent = current->parent(); - const int childIndex = findChild(current, parent); -@@ -146,9 +150,11 @@ static litehtml::element::ptr nextLeaf(c - qWarning() << "internal error: filed to find litehtml child element in parent"; - return stop; - } -- if (childIndex + 1 >= int(parent->get_children_count())) // no sibling, move up -+ if (childIndex + 1 >= int(parent->children().size())) // no sibling, move up - return nextLeaf(parent, stop); -- current = parent->get_child(childIndex + 1); -+ auto itChild = parent->children().begin(); -+ std::advance(itChild, childIndex + 1); -+ current = *itChild; - } - return firstLeaf(current, stop); - } -@@ -158,9 +164,9 @@ static Selection::Element selectionDetai - const QPoint &pos) - { - // shortcut, which _might_ not really be correct -- if (element->get_children_count() > 0) -+ if (element->children().size() > 0) - return {element, -1, -1}; // everything selected -- const QFont &font = toQFont(element->get_font()); -+ const QFont &font = toQFont(element->css().get_font()); - const QFontMetrics fm(font); - int previous = 0; - for (int i = 0; i < text.size(); ++i) { -@@ -182,7 +188,7 @@ static Selection::Element deepest_child_ - - // the following does not find the "smallest" element, it often consists of children - // with individual words as text... -- const litehtml::element::ptr element = document->root()->get_element_by_point(pos.x(), -+ const litehtml::element::ptr element = document->root_renderer()->get_element_by_point(pos.x(), - pos.y(), - viewportPos.x(), - viewportPos.y()); -@@ -193,15 +199,17 @@ static Selection::Element deepest_child_ - if (!element) - return {}; - Selection::Element result; -- for (int i = 0; i < int(element->get_children_count()); ++i) { -- const litehtml::element::ptr child = element->get_child(i); -+ litehtml_elements_vector children{element->children().begin(), element->children().end()}; -+ for (int i = 0, n = int(children.size()); i < n; ++i) { -+ const litehtml::element::ptr child = children.at(i); -+ litehtml::render_item render_item(child); - result = recursion(child, -- toQRect(child->get_position()).translated(placement.topLeft())); -+ toQRect(render_item.get_placement()).translated(placement.topLeft())); - if (result.element) - return result; - } - if (placement.contains(pos)) { -- litehtml::tstring text; -+ litehtml::string text; - element->get_text(text); - if (!text.empty()) { - return mode == Selection::Mode::Free -@@ -235,9 +243,9 @@ static QFont::Weight cssWeightToQtWeight - static QFont::Style toQFontStyle(litehtml::font_style style) - { - switch (style) { -- case litehtml::fontStyleNormal: -+ case litehtml::font_style_normal: - return QFont::StyleNormal; -- case litehtml::fontStyleItalic: -+ case litehtml::font_style_italic: - return QFont::StyleItalic; - } - // should not happen -@@ -355,7 +363,7 @@ void Selection::update() - { - const auto addElement = [this](const Selection::Element &element, - const Selection::Element &end = {}) { -- litehtml::tstring elemText; -+ litehtml::string elemText; - element.element->get_text(elemText); - const QString textStr = QString::fromStdString(elemText); - if (!textStr.isEmpty()) { -@@ -429,7 +437,7 @@ DocumentContainer::DocumentContainer() - - DocumentContainer::~DocumentContainer() = default; - --litehtml::uint_ptr DocumentContainerPrivate::create_font(const litehtml::tchar_t *faceName, -+litehtml::uint_ptr DocumentContainerPrivate::create_font(const char *faceName, - int size, - int weight, - litehtml::font_style italic, -@@ -486,14 +494,14 @@ void DocumentContainerPrivate::delete_fo - delete font; - } - --int DocumentContainerPrivate::text_width(const litehtml::tchar_t *text, litehtml::uint_ptr hFont) -+int DocumentContainerPrivate::text_width(const char *text, litehtml::uint_ptr hFont) - { - const QFontMetrics fm(toQFont(hFont)); - return fm.horizontalAdvance(QString::fromUtf8(text)); - } - - void DocumentContainerPrivate::draw_text(litehtml::uint_ptr hdc, -- const litehtml::tchar_t *text, -+ const char *text, - litehtml::uint_ptr hFont, - litehtml::web_color color, - const litehtml::position &pos) -@@ -515,7 +523,7 @@ int DocumentContainerPrivate::get_defaul - return m_defaultFont.pointSize(); - } - --const litehtml::tchar_t *DocumentContainerPrivate::get_default_font_name() const -+const char *DocumentContainerPrivate::get_default_font_name() const - { - return m_defaultFontFamilyName.constData(); - } -@@ -552,8 +560,8 @@ void DocumentContainerPrivate::draw_list - } - } - --void DocumentContainerPrivate::load_image(const litehtml::tchar_t *src, -- const litehtml::tchar_t *baseurl, -+void DocumentContainerPrivate::load_image(const char *src, -+ const char *baseurl, - bool redraw_on_ready) - { - const auto qtSrc = QString::fromUtf8(src); -@@ -570,8 +578,8 @@ void DocumentContainerPrivate::load_imag - m_pixmaps.insert(url, pixmap); - } - --void DocumentContainerPrivate::get_image_size(const litehtml::tchar_t *src, -- const litehtml::tchar_t *baseurl, -+void DocumentContainerPrivate::get_image_size(const char *src, -+ const char *baseurl, - litehtml::size &sz) - { - const auto qtSrc = QString::fromUtf8(src); -@@ -618,8 +626,9 @@ void DocumentContainerPrivate::buildInde - m_index.elementToIndex.insert({current, index}); - if (!inBody) - inBody = tagName(current).toLower() == "body"; -- if (inBody && current->is_visible()) { -- litehtml::tstring text; -+ litehtml::render_item render_item(current); -+ if (inBody && render_item.is_visible()) { -+ litehtml::string text; - current->get_text(text); - if (!text.empty()) { - m_index.indexToElement.push_back({index, current}); -@@ -658,13 +667,14 @@ void DocumentContainerPrivate::clearSele - } - - void DocumentContainerPrivate::draw_background(litehtml::uint_ptr hdc, -- const litehtml::background_paint &bg) -+ const std::vector&bgs) - { - auto painter = toQPainter(hdc); -- if (bg.is_root) { -+ if (bgs.empty() || bgs[0].is_root) { - // TODO ? - return; - } -+ litehtml::background_paint bg = bgs[0]; - painter->save(); - painter->setClipRect(toQRect(bg.clip_box)); - const QRegion horizontalMiddle( -@@ -807,12 +817,12 @@ void DocumentContainerPrivate::draw_bord - } - } - --void DocumentContainerPrivate::set_caption(const litehtml::tchar_t *caption) -+void DocumentContainerPrivate::set_caption(const char *caption) - { - m_caption = QString::fromUtf8(caption); - } - --void DocumentContainerPrivate::set_base_url(const litehtml::tchar_t *base_url) -+void DocumentContainerPrivate::set_base_url(const char *base_url) - { - m_baseUrl = QString::fromUtf8(base_url); - } -@@ -826,7 +836,7 @@ void DocumentContainerPrivate::link(cons - Q_UNUSED(el) - } - --void DocumentContainerPrivate::on_anchor_click(const litehtml::tchar_t *url, -+void DocumentContainerPrivate::on_anchor_click(const char *url, - const litehtml::element::ptr &el) - { - Q_UNUSED(el) -@@ -834,12 +844,12 @@ void DocumentContainerPrivate::on_anchor - m_linkCallback(resolveUrl(QString::fromUtf8(url), m_baseUrl)); - } - --void DocumentContainerPrivate::set_cursor(const litehtml::tchar_t *cursor) -+void DocumentContainerPrivate::set_cursor(const char *cursor) - { - m_cursorCallback(toQCursor(QString::fromUtf8(cursor))); - } - --void DocumentContainerPrivate::transform_text(litehtml::tstring &text, litehtml::text_transform tt) -+void DocumentContainerPrivate::transform_text(litehtml::string &text, litehtml::text_transform tt) - { - // TODO - qDebug(log) << "transform_text"; -@@ -847,9 +857,9 @@ void DocumentContainerPrivate::transform - Q_UNUSED(tt) - } - --void DocumentContainerPrivate::import_css(litehtml::tstring &text, -- const litehtml::tstring &url, -- litehtml::tstring &baseurl) -+void DocumentContainerPrivate::import_css(litehtml::string &text, -+ const litehtml::string &url, -+ litehtml::string &baseurl) - { - const QUrl actualUrl = resolveUrl(QString::fromStdString(url), QString::fromStdString(baseurl)); - const QString urlString = actualUrl.toString(QUrl::None); -@@ -859,16 +869,12 @@ void DocumentContainerPrivate::import_cs - } - - void DocumentContainerPrivate::set_clip(const litehtml::position &pos, -- const litehtml::border_radiuses &bdr_radius, -- bool valid_x, -- bool valid_y) -+ const litehtml::border_radiuses &bdr_radius) - { - // TODO - qDebug(log) << "set_clip"; - Q_UNUSED(pos) - Q_UNUSED(bdr_radius) -- Q_UNUSED(valid_x) -- Q_UNUSED(valid_y) - } - - void DocumentContainerPrivate::del_clip() -@@ -883,7 +889,7 @@ void DocumentContainerPrivate::get_clien - } - - std::shared_ptr DocumentContainerPrivate::create_element( -- const litehtml::tchar_t *tag_name, -+ const char *tag_name, - const litehtml::string_map &attributes, - const std::shared_ptr &doc) - { -@@ -901,7 +907,7 @@ void DocumentContainerPrivate::get_media - qDebug(log) << "get_media_features"; - } - --void DocumentContainerPrivate::get_language(litehtml::tstring &language, litehtml::tstring &culture) const -+void DocumentContainerPrivate::get_language(litehtml::string &language, litehtml::string &culture) const - { - // TODO - qDebug(log) << "get_language"; -@@ -919,11 +925,11 @@ void DocumentContainer::setScrollPositio - d->m_scrollPosition = pos; - } - --void DocumentContainer::setDocument(const QByteArray &data, DocumentContainerContext *context) -+void DocumentContainer::setDocument(const QByteArray &data) - { - d->m_pixmaps.clear(); - d->clearSelection(); -- d->m_document = litehtml::document::createFromUTF8(data.constData(), d.get(), &context->d->context); -+ d->m_document = litehtml::document::createFromString(data.constData(), d.get(), d->m_masterStyleSheet.toUtf8().constData()); - d->buildIndex(); - } - -@@ -1105,7 +1111,7 @@ QUrl DocumentContainer::linkAt(const QPo - { - if (!d->m_document) - return {}; -- const litehtml::element::ptr element = d->m_document->root()->get_element_by_point( -+ const litehtml::element::ptr element = d->m_document->root_renderer()->get_element_by_point( - documentPos.x(), documentPos.y(), viewportPos.x(), viewportPos.y()); - if (!element) - return {}; -@@ -1172,10 +1178,10 @@ void DocumentContainer::findText(const Q - } - - const auto fillXPos = [](const Selection::Element &e) { -- litehtml::tstring ttext; -+ litehtml::string ttext; - e.element->get_text(ttext); - const QString text = QString::fromStdString(ttext); -- const QFont &font = toQFont(e.element->get_font()); -+ const QFont &font = toQFont(e.element->css().get_font()); - const QFontMetrics fm(font); - return Selection::Element{e.element, e.index, fm.size(0, text.left(e.index)).width()}; - }; -@@ -1227,7 +1233,7 @@ void DocumentContainer::setDefaultFont(c - // we need to trigger the reparse of this info. - if (d->m_document && d->m_document->root()) { - d->m_document->root()->refresh_styles(); -- d->m_document->root()->parse_styles(); -+ d->m_document->root()->compute_styles(); - } - } - -@@ -1271,6 +1277,11 @@ void DocumentContainer::setClipboardCall - d->m_clipboardCallback = callback; - } - -+void DocumentContainer::setMasterStyleSheet(const QString& styleSheet) -+{ -+ d->m_masterStyleSheet = styleSheet; -+} -+ - static litehtml::element::ptr elementForY(int y, const litehtml::document::ptr &document) - { - if (!document) -@@ -1279,11 +1290,13 @@ static litehtml::element::ptr elementFor - const std::function recursion = - [&recursion](int y, const litehtml::element::ptr &element) { - litehtml::element::ptr result; -- const int subY = y - element->get_position().y; -+ litehtml::render_item render_item(element); -+ const int subY = y - render_item.get_placement().y; - if (subY <= 0) - return element; -- for (int i = 0; i < int(element->get_children_count()); ++i) { -- const litehtml::element::ptr child = element->get_child(i); -+ litehtml_elements_vector children{element->children().begin(), element->children().end()}; -+ for (int i = 0, n = int(children.size()); i < n; ++i) { -+ const litehtml::element::ptr child = children.at(i); - result = recursion(subY, child); - if (result) - return result; -@@ -1370,14 +1383,3 @@ Index::Entry Index::findElement(int inde - return {-1, {}}; - return *(upper - 1); - } -- --DocumentContainerContext::DocumentContainerContext() -- : d(new DocumentContainerContextPrivate) --{} -- --DocumentContainerContext::~DocumentContainerContext() = default; -- --void DocumentContainerContext::setMasterStyleSheet(const QString &css) --{ -- d->context.load_master_stylesheet(css.toUtf8().constData()); --} -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/container_qpainter.h qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/container_qpainter.h ---- qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/container_qpainter.h 2023-12-11 02:10:02.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/container_qpainter.h 2024-02-03 13:27:45.034587855 +0100 -@@ -19,22 +19,6 @@ - #include - - class DocumentContainerPrivate; --class DocumentContainerContextPrivate; -- --class QLITEHTML_EXPORT DocumentContainerContext --{ --public: -- DocumentContainerContext(); -- ~DocumentContainerContext(); -- -- void setMasterStyleSheet(const QString &css); -- --private: -- std::unique_ptr d; -- -- friend class DocumentContainer; -- friend class DocumentContainerPrivate; --}; - - class QLITEHTML_EXPORT DocumentContainer - { -@@ -44,7 +28,7 @@ public: - - public: // outside API - void setPaintDevice(QPaintDevice *paintDevice); -- void setDocument(const QByteArray &data, DocumentContainerContext *context); -+ void setDocument(const QByteArray &data); - bool hasDocument() const; - void setBaseUrl(const QString &url); - void setScrollPosition(const QPoint &pos); -@@ -102,6 +86,8 @@ public: // outside API - - int withFixedElementPosition(int y, const std::function &action); - -+ void setMasterStyleSheet(const QString& styleSheet); -+ - private: - std::unique_ptr d; - }; -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/container_qpainter_p.h qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/container_qpainter_p.h ---- qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/container_qpainter_p.h 2023-12-11 02:10:02.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/container_qpainter_p.h 2024-02-03 13:27:45.047587812 +0100 -@@ -58,55 +58,53 @@ struct Index - class DocumentContainerPrivate final : public litehtml::document_container - { - public: // document_container API -- litehtml::uint_ptr create_font(const litehtml::tchar_t *faceName, -+ litehtml::uint_ptr create_font(const char *faceName, - int size, - int weight, - litehtml::font_style italic, - unsigned int decoration, - litehtml::font_metrics *fm) override; - void delete_font(litehtml::uint_ptr hFont) override; -- int text_width(const litehtml::tchar_t *text, litehtml::uint_ptr hFont) override; -+ int text_width(const char *text, litehtml::uint_ptr hFont) override; - void draw_text(litehtml::uint_ptr hdc, -- const litehtml::tchar_t *text, -+ const char *text, - litehtml::uint_ptr hFont, - litehtml::web_color color, - const litehtml::position &pos) override; - int pt_to_px(int pt) const override; - int get_default_font_size() const override; -- const litehtml::tchar_t *get_default_font_name() const override; -+ const char *get_default_font_name() const override; - void draw_list_marker(litehtml::uint_ptr hdc, const litehtml::list_marker &marker) override; -- void load_image(const litehtml::tchar_t *src, -- const litehtml::tchar_t *baseurl, -+ void load_image(const char *src, -+ const char *baseurl, - bool redraw_on_ready) override; -- void get_image_size(const litehtml::tchar_t *src, -- const litehtml::tchar_t *baseurl, -+ void get_image_size(const char *src, -+ const char *baseurl, - litehtml::size &sz) override; -- void draw_background(litehtml::uint_ptr hdc, const litehtml::background_paint &bg) override; -+ void draw_background(litehtml::uint_ptr hdc, const std::vector&bgs) override; - void draw_borders(litehtml::uint_ptr hdc, - const litehtml::borders &borders, - const litehtml::position &draw_pos, - bool root) override; -- void set_caption(const litehtml::tchar_t *caption) override; -- void set_base_url(const litehtml::tchar_t *base_url) override; -+ void set_caption(const char *caption) override; -+ void set_base_url(const char *base_url) override; - void link(const std::shared_ptr &doc, - const litehtml::element::ptr &el) override; -- void on_anchor_click(const litehtml::tchar_t *url, const litehtml::element::ptr &el) override; -- void set_cursor(const litehtml::tchar_t *cursor) override; -- void transform_text(litehtml::tstring &text, litehtml::text_transform tt) override; -- void import_css(litehtml::tstring &text, -- const litehtml::tstring &url, -- litehtml::tstring &baseurl) override; -+ void on_anchor_click(const char *url, const litehtml::element::ptr &el) override; -+ void set_cursor(const char *cursor) override; -+ void transform_text(litehtml::string &text, litehtml::text_transform tt) override; -+ void import_css(litehtml::string &text, -+ const litehtml::string &url, -+ litehtml::string &baseurl) override; - void set_clip(const litehtml::position &pos, -- const litehtml::border_radiuses &bdr_radius, -- bool valid_x, -- bool valid_y) override; -+ const litehtml::border_radiuses &bdr_radius) override; - void del_clip() override; - void get_client_rect(litehtml::position &client) const override; -- std::shared_ptr create_element(const litehtml::tchar_t *tag_name, -+ std::shared_ptr create_element(const char *tag_name, - const litehtml::string_map &attributes, - const std::shared_ptr &doc) override; - void get_media_features(litehtml::media_features &media) const override; -- void get_language(litehtml::tstring &language, litehtml::tstring &culture) const override; -+ void get_language(litehtml::string &language, litehtml::string &culture) const override; - - QPixmap getPixmap(const QString &imageUrl, const QString &baseUrl); - QString serifFont() const; -@@ -136,10 +134,5 @@ public: // document_container API - DocumentContainer::PaletteCallback m_paletteCallback; - DocumentContainer::ClipboardCallback m_clipboardCallback; - bool m_blockLinks = false; --}; -- --class DocumentContainerContextPrivate --{ --public: -- litehtml::context context; -+ QString m_masterStyleSheet; - }; -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/qlitehtmlwidget.cpp qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/qlitehtmlwidget.cpp ---- qt-creator-opensource-src-12.0.1/src/libs/qlitehtml/src/qlitehtmlwidget.cpp 2023-12-11 02:10:02.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/libs/qlitehtml/src/qlitehtmlwidget.cpp 2024-02-03 13:27:45.056587782 +0100 -@@ -346,7 +346,6 @@ class QLiteHtmlWidgetPrivate - { - public: - QString html; -- DocumentContainerContext context; - QUrl url; - DocumentContainer documentContainer; - qreal zoomFactor = 1; -@@ -376,7 +375,7 @@ QLiteHtmlWidget::QLiteHtmlWidget(QWidget - d->documentContainer.setClipboardCallback([this](bool yes) { emit copyAvailable(yes); }); - - // TODO adapt mastercss to palette (default text & background color) -- d->context.setMasterStyleSheet(mastercss); -+ d->documentContainer.setMasterStyleSheet(mastercss); - } - - QLiteHtmlWidget::~QLiteHtmlWidget() -@@ -407,7 +406,7 @@ void QLiteHtmlWidget::setHtml(const QStr - { - d->html = content; - d->documentContainer.setPaintDevice(viewport()); -- d->documentContainer.setDocument(content.toUtf8(), &d->context); -+ d->documentContainer.setDocument(content.toUtf8()); - verticalScrollBar()->setValue(0); - horizontalScrollBar()->setValue(0); - render(); diff --git a/qt-creator.spec b/qt-creator.spec index 253555c..6307740 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,17 +1,17 @@ -#define prerelease beta1 +%define prerelease beta2 # We need avoid oython byte compiler to not crash over template .py file which # is not a valid python file, only for the IDE %global _python_bytecompile_errors_terminate_build 0 Name: qt-creator -Version: 12.0.2 -Release: 2%{?dist} +Version: 13.0.0 +Release: 0.2%{?prerelease:.%prerelease}%{?dist} Summary: Cross-platform IDE for Qt License: GPL-3.0-only WITH Qt-GPL-exception-1.0 URL: https://www.qt.io/ide/ -Source0: https://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/12.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz +Source0: https://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/13.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz Source1: qt-creator-Fedora-privlibs # In Fedora, the ninja command is called ninja-build @@ -22,10 +22,10 @@ Patch1: qt-creator_desktop.patch Patch2: qt-creator_qmake-names.patch # Fix debuginfod detection Patch3: qt-creator-debuginfod.patch -%if 0%{?fedora} -# Fix build against litehtml-0.8 -Patch4: qt-creator-litehtml.patch -%endif +# Fix build +Patch4: qt-creator_build.patch +# Drop refereces to unbundled yaml-cpp +Patch5: qt-creator_unbundle.patch BuildRequires: chrpath BuildRequires: cmake @@ -212,6 +212,9 @@ diff -u %{SOURCE1} $outfile %changelog +* Mon Mar 04 2024 Sandro Mani - 13.0.0-0.2.beta2 +- Update to 13.0.0-beta2 + * Fri Feb 16 2024 Jan Grulich - Rebuild (qt6) diff --git a/qt-creator_build.patch b/qt-creator_build.patch new file mode 100644 index 0000000..87ca9d5 --- /dev/null +++ b/qt-creator_build.patch @@ -0,0 +1,12 @@ +diff -rupN qt-creator-opensource-src-13.0.0-beta2/src/plugins/projectexplorer/runcontrol.cpp qt-creator-opensource-src-13.0.0-beta2-new/src/plugins/projectexplorer/runcontrol.cpp +--- qt-creator-opensource-src-13.0.0-beta2/src/plugins/projectexplorer/runcontrol.cpp 2024-02-28 05:02:14.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/src/plugins/projectexplorer/runcontrol.cpp 2024-03-04 10:41:53.568863067 +0100 +@@ -418,7 +418,7 @@ void RunControl::setDevice(const IDevice + QTC_CHECK(!d->device); + d->device = device; + #ifdef WITH_JOURNALD +- if (!device.isNull() && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { ++ if (!device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { + JournaldWatcher::instance()->subscribe(this, [this](const JournaldWatcher::LogEntry &entry) { + + if (entry.value("_MACHINE_ID") != JournaldWatcher::instance()->machineId()) diff --git a/qt-creator_desktop.patch b/qt-creator_desktop.patch index 675737b..fb75697 100644 --- a/qt-creator_desktop.patch +++ b/qt-creator_desktop.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-12.0.1-new/share/applications/org.qt-project.qtcreator.desktop ---- qt-creator-opensource-src-12.0.1/share/applications/org.qt-project.qtcreator.desktop 2023-12-11 02:09:57.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/share/applications/org.qt-project.qtcreator.desktop 2024-02-03 13:27:42.036597741 +0100 +diff -rupN --no-dereference qt-creator-opensource-src-13.0.0-beta2/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-13.0.0-beta2-new/share/applications/org.qt-project.qtcreator.desktop +--- qt-creator-opensource-src-13.0.0-beta2/share/applications/org.qt-project.qtcreator.desktop 2024-02-28 05:02:12.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/share/applications/org.qt-project.qtcreator.desktop 2024-03-04 10:41:43.975653722 +0100 @@ -8,5 +8,5 @@ Icon=QtProject-qtcreator StartupWMClass=qtcreator Terminal=false diff --git a/qt-creator_ninja-build.patch b/qt-creator_ninja-build.patch index c479f09..7b314b4 100644 --- a/qt-creator_ninja-build.patch +++ b/qt-creator_ninja-build.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp qt-creator-opensource-src-12.0.1-new/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp ---- qt-creator-opensource-src-12.0.1/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp 2023-12-11 02:10:01.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp 2024-02-03 13:27:41.052600977 +0100 -@@ -670,7 +670,7 @@ QVariant CMakeGeneratorKitAspectFactory: +diff -rupN --no-dereference qt-creator-opensource-src-13.0.0-beta2/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp qt-creator-opensource-src-13.0.0-beta2-new/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp +--- qt-creator-opensource-src-13.0.0-beta2/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp 2024-02-28 05:02:14.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp 2024-03-04 10:41:43.014632748 +0100 +@@ -667,7 +667,7 @@ QVariant CMakeGeneratorKitAspectFactory: const bool hasNinja = [k, tool] { if (Internal::settings().ninjaPath().isEmpty()) { auto findNinja = [](const Environment &env) -> bool { @@ -10,9 +10,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/plugins/cmakepr }; if (!findNinja(tool->filePath().deviceEnvironment())) return findNinja(k->buildEnvironment()); -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/plugins/mesonprojectmanager/mesontools.h qt-creator-opensource-src-12.0.1-new/src/plugins/mesonprojectmanager/mesontools.h ---- qt-creator-opensource-src-12.0.1/src/plugins/mesonprojectmanager/mesontools.h 2023-12-11 02:09:59.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/plugins/mesonprojectmanager/mesontools.h 2024-02-03 13:27:41.055600967 +0100 +diff -rupN --no-dereference qt-creator-opensource-src-13.0.0-beta2/src/plugins/mesonprojectmanager/mesontools.h qt-creator-opensource-src-13.0.0-beta2-new/src/plugins/mesonprojectmanager/mesontools.h +--- qt-creator-opensource-src-13.0.0-beta2/src/plugins/mesonprojectmanager/mesontools.h 2024-02-28 05:02:14.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/src/plugins/mesonprojectmanager/mesontools.h 2024-03-04 10:41:43.017632814 +0100 @@ -32,7 +32,7 @@ public: const Utils::FilePath &exe) { diff --git a/qt-creator_qmake-names.patch b/qt-creator_qmake-names.patch index 6863a70..2c3a0a5 100644 --- a/qt-creator_qmake-names.patch +++ b/qt-creator_qmake-names.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-12.0.1-new/src/libs/utils/buildablehelperlibrary.cpp ---- qt-creator-opensource-src-12.0.1/src/libs/utils/buildablehelperlibrary.cpp 2023-12-11 02:10:01.000000000 +0100 -+++ qt-creator-opensource-src-12.0.1-new/src/libs/utils/buildablehelperlibrary.cpp 2024-02-03 13:27:43.062594362 +0100 +diff -rupN --no-dereference qt-creator-opensource-src-13.0.0-beta2/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-13.0.0-beta2-new/src/libs/utils/buildablehelperlibrary.cpp +--- qt-creator-opensource-src-13.0.0-beta2/src/libs/utils/buildablehelperlibrary.cpp 2024-02-28 05:02:16.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/src/libs/utils/buildablehelperlibrary.cpp 2024-03-04 10:41:44.898673866 +0100 @@ -155,7 +155,12 @@ QStringList BuildableHelperLibrary::poss // On Unix some distributions renamed qmake with a postfix to avoid clashes // On OS X, Qt 4 binary packages also has renamed qmake. There are also symbolic links that are diff --git a/qt-creator_unbundle.patch b/qt-creator_unbundle.patch new file mode 100644 index 0000000..b029344 --- /dev/null +++ b/qt-creator_unbundle.patch @@ -0,0 +1,23 @@ +diff -rupN qt-creator-opensource-src-13.0.0-beta2/qt_attributions.json qt-creator-opensource-src-13.0.0-beta2-new/qt_attributions.json +--- qt-creator-opensource-src-13.0.0-beta2/qt_attributions.json 2024-02-28 05:02:12.000000000 +0100 ++++ qt-creator-opensource-src-13.0.0-beta2-new/qt_attributions.json 2024-03-04 11:30:27.303884715 +0100 +@@ -1,19 +1,5 @@ + [ + { +- "Id": "yaml-cpp", +- "Name": "YAML C++ Parser", +- "QDocModule": "qtcreator", +- "QtParts": ["tools"], +- "QtUsage": "Used for parsing output of Clazy and Clang Tidy.", +- "Path": "src/libs/3rdparty/yaml-cpp", +- "Description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", +- "Homepage": "https://github.com/jbeder/yaml-cpp", +- "Version": "0.8.0", +- "License": "MIT License", +- "LicenseFile": "src/libs/3rdparty/yaml-cpp/LICENSE", +- "Copyright": "Copyright (c) 2008-2015 Jesse Beder." +- }, +- { + "Id": "ksyntaxhighlighting", + "Name": "KSyntaxHighlighting", + "QDocModule": "qtcreator", diff --git a/sources b/sources index e0d1f10..fc1c882 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-creator-opensource-src-12.0.2.tar.xz) = cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1 +SHA512 (qt-creator-opensource-src-13.0.0-beta2.tar.xz) = df81ff47dad5a79c0326119dd3d71526b4ed62d2c3ed5e0dfe6c14e80f0bf628163c715d84d4ecc29e7e34e4e59848abd6f9b1ef01893e5209e6280debe15c1a