feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
72,373 Commits 108 Branches 368 Tags
abf1ec7cdc366c49dc604ec064ac63aef6daefbf
Commit Graph

20 Commits

Author SHA1 Message Date
Eike Ziller
1368111824 Merge remote-tracking branch 'origin/6.0' into 7.0 
Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
 2022-02-02 10:17:03 +01:00
Tapani Mattila
a117a558fe CMake generation: Streamline confirmation dialog 
Task-number: QDS-5991
Change-Id: I1cec8650703ca5de936739d1adbba77d0b64562e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-01-27 11:00:04 +00:00
hjk
1fc83d2a56 Utils: Wrap various file system iteration flags and filters 
... into a single class.

This makes passing them around as a whole easier, and opens a path
to have "generic" filters in form of a lambda or such.

Change-Id: Ibf644b2fedcf0f1a35258030710afff8f5873f88
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-01-26 13:13:41 +00:00
Tapani Mattila
c57573708a Move qrc, rcc and CMakeLists.txt generating menu option to file menu 
Task-number: QDS-5903
Change-Id: I42cba21eaecaf5580c40dab8ce32bbf12c37f13f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-01-18 10:32:25 +00:00
Tapani Mattila
85dab69262 CMake generator: Integrate warnings in confirmation dialog 
Task-number: QDS-5856
Change-Id: If95515ee0921598623a024fd7bd8fe8ef3482aa9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-01-12 10:32:00 +00:00
Tapani Mattila
41ad55a789 Fix missing const in function signature: generatecmakelists.cpp 
Change-Id: I3ceae315513f94cb402ba22a48849138ae3944d3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-12-21 18:00:38 +00:00
Tapani Mattila
8a14a14aae CMake generator: Include qt control configuration file in executable 
Task-number: QDS-5815
Change-Id: I8ea049c60ce2f0217e3598e2a2a92dad7a776449
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-12-21 10:31:50 +00:00
Tapani Mattila
9b3575f9cf CMake generator: Generate environment header 
Task-number: QDS-5706
Change-Id: I650a70ec3dc821458332d86effe872ffe19f2a60
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-12-20 13:00:48 +00:00
Tapani Mattila
5621b1bf22 CMake generator: Fix Q_IMPORT_QML_PLUGIN argument 
Change-Id: I1fcf397ca188b03c580ad2f76bdab4c44eec2113
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-12-10 11:21:30 +00:00
Tapani Mattila
bf4a85d60c CMake generator: Fix support for deeper module folder structure and asset_imports 
Task-number: QDS-5585
Change-Id: Id7d6f551acc5692a6c7c580d5ffc90ca7528bbc8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2021-11-30 19:25:41 +00:00
Tapani Mattila
f8f7f47ec3 CMake generator: Make only some files selected by default 
Task-number: QDS-5561
Change-Id: I1a76385f55681ba60bdb43eafdede6697893598f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-11-22 17:07:18 +00:00
Tapani Mattila
46c3540961 CMake generator: Add translation contexts 
Change-Id: Icdd2ce4626588e6bdcd870cae915ef2f48a85666
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-11-22 14:11:50 +00:00
Christian Stenger
8368b4ed64 QmlDesigner: Fix build on Windows 
Use Qt styled enum values to avoid clashing global defines.
Amends 06a6549075.

Change-Id: I85d3ec4192c1c55f231b6e2e81ec114480c03a5c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-11-18 10:18:09 +00:00
Tapani Mattila
06a6549075 CMake generator: Add sanity checks 
Task-number: QDS-5410
Change-Id: I8f3cd130d7f5bfac3656e8d006661a81a5412abd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2021-11-18 09:27:23 +00:00
Tapani Mattila
d325db3eb2 CMake generating: Modify to generate files according to new dir structure 
Task-number: QDS-5380
Change-Id: Ic3a4d6f4cd05185ded31b5d40adef43ff6508407
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-11-12 10:21:56 +00:00
Tapani Mattila
533ed33706 CMake file generation: Dialog for deselecting generated files 
Task-number: QDS-5331
Change-Id: Ib1470069ab444dfd792e40fadc338d6452b727ca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-11-04 15:24:16 +00:00
Tapani Mattila
0fc1bb6187 CMake file generation: Generate main.cpp and main.qml 
Task-number: QDS-5254
Change-Id: Ide893002df72adde77ef018482a4bd13c207780f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-10-26 12:57:16 +00:00
Tapani Mattila
46d9fa36df Fix CMake file generation to include module subdirectories properly 
Task-number: QDS-5273
Change-Id: Id32ef746851a51a54941359548d0e35608f282a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-10-26 12:56:42 +00:00
hjk
d20a0c8c03 QmlDesigner: Add #include <QTextStream> 
Amends d1b62588c5.

Change-Id: I10a6fe427087e60dd29b18488e15519a88fd77df
Reviewed-by: hjk <hjk@qt.io>
 2021-10-12 11:34:14 +00:00
Tapani Mattila
d1b62588c5 Add action to generate CMake files for QML projects 
Task-number: QDS-5140
Change-Id: I56d2d3d9efce4bea1281eb60a059119f5b29c02c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-10-11 12:35:19 +00:00