Commit Graph

10 Commits

Author SHA1 Message Date
Eike Ziller
f58a617ea9 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iab6befd5e713289877aa0a47b9ce6bddfb5e2593
2017-11-16 08:49:06 +01:00
Christian Stenger
895eed7164 Wizards: Fix project files for macOS
Task-number: QTCREATORBUG-19286
Change-Id: I81a7486edfd34570d7b4bd82646a2e5e39a585ee
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 10:55:33 +00:00
Andre Hartmann
57e35274c2 Wizards: Prettify template QMake project files
Having each source/header/form file on its own line
makes further moving around (e.g. sorting) much easier.

Also bring indentation for source/header sections to
the same level.

Amends commit cf40d98dc9

Change-Id: I95ad9c9298ae01e548a595b29d7f7651220adadd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 10:29:41 +00:00
Jake Petroules
b0229acd54 Clean up projects wizards and support for Qbs+CMake+qmake to all
Task-number: QTCREATORBUG-17308
Change-Id: I5d320a52f2cc5c0adbaf513985e4be0d75219a7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 18:19:57 +00:00
Tobias Hunger
e6d553ce59 Wizards: Explicitly list sources in CMakeLists.txt
Task-number: QTCREATORBUG-17196
Change-Id: I478f2f945a6f7ee3183aa09871bccc7e475e5501
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:31 +00:00
Tobias Hunger
137695cae7 Wizards: Move cmake required version before project line
This is apparently necessary to establish policy before setting up
things.

Task-number: QTCREATORBUG-17197
Change-Id: I8b12e752e05e65b2275c0a97cf1b727f60c88cd0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:25 +00:00
Tobias Hunger
aa37df645d JsonWizard: Update to use supportedProjectType
Remove "kind" as that is no longer necessary (even though it is still
handled if that is in the wizard).

Change-Id: I3e56d5e0d936b622dae5091950427f9b2db60695
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:20:55 +00:00
Tobias Hunger
6bb78124ab Plain C/CPP Wizards: Use proper main signature
Change-Id: I1d6e83cda2685201aa4126e993dac85cda8315b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-09 11:24:29 +00:00
Jake Petroules
46910b46c3 Adapt Qbs code to latest changes.
type: application actually does nothing now, as the application type is
used for both bundled and unbundled products on Apple platforms.
Instead, consoleApplication being set to true influences Qbs not to use
a bundle.

cpp.infoPlistFile became bundle.infoPlistFile in Qbs 1.4.

Change-Id: I6540aa91b2db61ed4cbf2ff30bd46d69db5f9d92
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-21 20:51:12 +00:00
Tobias Hunger
6b6091ea61 Replace several "Plain C++" with one JSON wizard
Change-Id: Ia08f2127cdb25785cf313ec0a31a3d9775161c9b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-01 13:45:01 +00:00