diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2022-11-18 15:15:16 +0800 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-12-01 10:26:20 +0800 |
commit | 4bd87b903b355b53e3105ba1ae7c154c4e55cdaf (patch) | |
tree | cc2edb597f0d5871302eb86e9dda78217384a5aa /.gitignore | |
parent | 786e1748d4469c135a922a221024f3f9c421c0de (diff) |
Remove "2" from Qt Quick Controls directories
Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.
By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.
This patch does the following:
- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.
A follow-up patch will handle documentation.
It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.
Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/.gitignore b/.gitignore index 39f4cbaca5..e6ff521c67 100644 --- a/.gitignore +++ b/.gitignore @@ -85,32 +85,32 @@ bin/qml* bin/qttracereplay* configure.cache config.status -examples/quickcontrols2/chattutorial/chapter1-settingup/chapter1-settingup -examples/quickcontrols2/chattutorial/chapter2-lists/chapter2-lists -examples/quickcontrols2/chattutorial/chapter3-navigation/chapter3-navigation -examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models -examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling -examples/quickcontrols2/contactlist/contactlist -examples/quickcontrols2/flatstyle/flatstyle -examples/quickcontrols2/gallery/gallery -examples/quickcontrols2/imagine/automotive/automotive -examples/quickcontrols2/imagine/musicplayer/musicplayer -examples/quickcontrols2/sidepanel/sidepanel -examples/quickcontrols2/swipetoremove/swipetoremove -examples/quickcontrols2/texteditor/texteditor -examples/quickcontrols2/wearable/wearable +examples/quickcontrols/chattutorial/chapter1-settingup/chapter1-settingup +examples/quickcontrols/chattutorial/chapter2-lists/chapter2-lists +examples/quickcontrols/chattutorial/chapter3-navigation/chapter3-navigation +examples/quickcontrols/chattutorial/chapter4-models/chapter4-models +examples/quickcontrols/chattutorial/chapter5-styling/chapter5-styling +examples/quickcontrols/contactlist/contactlist +examples/quickcontrols/flatstyle/flatstyle +examples/quickcontrols/gallery/gallery +examples/quickcontrols/imagine/automotive/automotive +examples/quickcontrols/imagine/musicplayer/musicplayer +examples/quickcontrols/sidepanel/sidepanel +examples/quickcontrols/swipetoremove/swipetoremove +examples/quickcontrols/texteditor/texteditor +examples/quickcontrols/wearable/wearable moc_*.cpp qmake/qmake.exe qmake/Makefile.bak src/corelib/global/qconfig.cpp src/corelib/global/qconfig.h src/corelib/global/qconfig.h.qmake -src/quickcontrols2/qtquickcontrols2-config.h -src/quickcontrols2/qtquickcontrols2-config.pri -src/quickcontrols2/qtquickcontrols2-config_p.h -src/quicktemplates2/qtquicktemplates2-config.h -src/quicktemplates2/qtquicktemplates2-config.pri -src/quicktemplates2/qtquicktemplates2-config_p.h +src/quickcontrols/qtquickcontrols2-config.h +src/quickcontrols/qtquickcontrols2-config.pri +src/quickcontrols/qtquickcontrols2-config_p.h +src/quicktemplates/qtquicktemplates2-config.h +src/quicktemplates/qtquicktemplates2-config.pri +src/quicktemplates/qtquicktemplates2-config_p.h ui_*.h tests/auto/cmake/build tests/auto/installed_cmake/build @@ -127,50 +127,50 @@ tests/auto/qprocess/fileWriterProcess.txt .com.apple.timemachine.supported tests/auto/qlibrary/libmylib.so* tests/auto/qresourceengine/runtime_resource.rcc -tests/auto/quickcontrols2/accessibility/tst_accessibility -tests/auto/quickcontrols2/calendar/tst_calendar -tests/auto/quickcontrols2/controls/basic/tst_basic -tests/auto/quickcontrols2/controls/fusion/tst_fusion -tests/auto/quickcontrols2/controls/imagine/tst_imagine -tests/auto/quickcontrols2/controls/material/tst_material -tests/auto/quickcontrols2/controls/universal/tst_universal -tests/auto/quickcontrols2/cursor/tst_cursor -tests/auto/quickcontrols2/customization/tst_customization -tests/auto/quickcontrols2/focus/tst_focus -tests/auto/quickcontrols2/font/tst_font -tests/auto/quickcontrols2/palette/tst_palette -tests/auto/quickcontrols2/platform/tst_platform -tests/auto/quickcontrols2/pressandhold/tst_pressandhold -tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow -tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor -tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer -tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage -tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel -tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle -tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle -tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf -tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu -tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar -tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage -tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup -tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle -tests/auto/quickcontrols2/qquickstyleselector/tst_qquickstyleselector -tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle -tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf -tests/auto/quickcontrols2/revisions/tst_revisions -tests/auto/quickcontrols2/sanity/tst_sanity -tests/auto/quickcontrols2/snippets/tst_snippets -tests/auto/quickcontrols2/styles/tst_styles -tests/auto/quickcontrols2/snippets/screenshots/*.png +tests/auto/quickcontrols/accessibility/tst_accessibility +tests/auto/quickcontrols/calendar/tst_calendar +tests/auto/quickcontrols/controls/basic/tst_basic +tests/auto/quickcontrols/controls/fusion/tst_fusion +tests/auto/quickcontrols/controls/imagine/tst_imagine +tests/auto/quickcontrols/controls/material/tst_material +tests/auto/quickcontrols/controls/universal/tst_universal +tests/auto/quickcontrols/cursor/tst_cursor +tests/auto/quickcontrols/customization/tst_customization +tests/auto/quickcontrols/focus/tst_focus +tests/auto/quickcontrols/font/tst_font +tests/auto/quickcontrols/palette/tst_palette +tests/auto/quickcontrols/platform/tst_platform +tests/auto/quickcontrols/pressandhold/tst_pressandhold +tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow +tests/auto/quickcontrols/qquickcolor/tst_qquickcolor +tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer +tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage +tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel +tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle +tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle +tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf +tests/auto/quickcontrols/qquickmenu/tst_qquickmenu +tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar +tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage +tests/auto/quickcontrols/qquickpopup/tst_qquickpopup +tests/auto/quickcontrols/qquickstyle/tst_qquickstyle +tests/auto/quickcontrols/qquickstyleselector/tst_qquickstyleselector +tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle +tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf +tests/auto/quickcontrols/revisions/tst_revisions +tests/auto/quickcontrols/sanity/tst_sanity +tests/auto/quickcontrols/snippets/tst_snippets +tests/auto/quickcontrols/styles/tst_styles +tests/auto/quickcontrols/snippets/screenshots/*.png tests/benchmarks/creationtime/tst_creationtime tests/benchmarks/objectcount/tst_objectcount -tests/manual/quickcontrols2/buttons/buttons -tests/manual/quickcontrols2/fonts/fonts -tests/manual/quickcontrols2/gifs/tst_gifs -tests/manual/quickcontrols2/styles/styles -tests/manual/quickcontrols2/testbench/testbench -tests/manual/quickcontrols2/screenshots/screenshots -tests/manual/quickcontrols2/gifs/gifs/*.gif +tests/manual/quickcontrols/buttons/buttons +tests/manual/quickcontrols/fonts/fonts +tests/manual/quickcontrols/gifs/tst_gifs +tests/manual/quickcontrols/styles/styles +tests/manual/quickcontrols/testbench/testbench +tests/manual/quickcontrols/screenshots/screenshots +tests/manual/quickcontrols/gifs/gifs/*.gif tools/qtestlib/chart/chart* tools/qtestlib/updater/updater* tools/qmleasing/qmleasing |