That is closer to what a user expects than the "0" and "1" used
before.
Change-Id: I08b3a7b0361dd54b75ee7b2213b3d120fb016bf5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Now that we have the infrastructure to handle both separately it makes
no more sense to merge them.
Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
We do not want to encourage the use of custom wizards, so
remove the examples. The Json wizard has already enough
real-world examples IMHO.
Change-Id: Ic755e01ce0430b90ad4d5ea3496c11ce162249bf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Map existing class wizards to file wizards. The separation has never
been clean anyway. Now "file" wizards create one or more files,
"project" wizards create a complete project (something that can be
opened as a project in Qt Creator).
Change-Id: I0562f26019b54a59d46814a13a0b2fa8995c3e0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Replace existing wizards with new ones of the same id.
Change-Id: Ia17e6a4df5e7c8b647eccbe3bfb13e1c5b2d09e0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Let the user chose whether "native styling" via QWidgets/QApplication
should be enabled or not.
Change-Id: I5eaa7b3a94d5361e62ebce61ff6b7b9216e15b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of Qt
Creator, the .qml.ui split is now optional.
Change-Id: Ic6d35e650cf0a7735cdfac9080f95015309a5879
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of
Qt Creator, the .qml.ui split is now optional.
Change-Id: I4b5ebcc35a585fad6ebc2e994711ca23e3300717
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Keep QNX.
A short informal search did not turn up any more blackberry users,
even though there is interest in QNX. So this patch removes the
platform: We had no contact with the maintainers in months, there
are no changes going into the code for about as long.
I am not even aware of anybody testing the platform, so any
remaining users are probably better of with Qt Creator 3.2 or so
where the code was extensively tested.
Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Since this was the only template using the qt quick application viewer,
remove all traces of that too.
And this was also the only "upgradeable" template, so remove all traces
of the upgrade code too.
Change-Id: I68989dc5a87621593f3b5dd8c4979bb59f137200
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
It was only used by the plain C and plain C++ templates. Given how ugly
and unmaintained deployment.pri is that is probably not a smart choice.
Change-Id: Idfdd4ec2b8e353d39505b603c3f4ca92bb34efcf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
- andorid-no-sdk should not be used for new projects anymore.
- The android scope is handled in android.prf in qt, and there the
handling is better, so removing this actually fixes a bug.
Change-Id: I2b901e0cb1fd4bc0d00fbcd3c8ea08b22e4bca49
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This reverts commit 67581c5faa.
The patch has multiple issues:
Removing and renaming the .qml file will leave the 'other'
place unaltered. Also, adding new .qml files won't add them
to both places.
Change-Id: I918aa398f9cd183378982fb15562e8fa66d3ede3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
It's nice that main.qml shows up in the project tree under "QML"
Change-Id: I4e8be4cc962f2d1c204e7435e0a67a88ea76db5e
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
A Item is more light weight than a Rectangle and using it against a white
background is useless. Actually Rectangle is not very much used so Item
is a better default. Width and height are dangerous too because people
exchange them with bindings instead of using anchors or layouts.
Change-Id: I4a89ddfc0f96fb3cdb0a9ccad7fcf80b8f28b479
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Allow for descriptions of project wizards that will be displayed in the
Project location page.
Task-number: QTCREATORBUG-13924
Change-Id: I7d65aba0e07f074cc0935318cff9b93f166a1c51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
We registered a mime type "application/x-qml" conflicting with "text/x-
qml" from freedesktop.org.xml. The magic matcher of the C++ mime types
might kick in, in that case.
Task-number: QTCREATORBUG-13994
Change-Id: I5900c233b42681d7b7d3af185d6ff3e1c4166e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
next if file =~ %r{src/shared/qbs|/qmljs/}
s = File.read(file)
s.scan(/^using namespace (.*);$/) {
ns = $1
t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
before = $1
char = $2
if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
m
else
before + char
end
}
if t != s
puts file
File.open(file, 'w').write(t)
end
}
}
Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Task-number: QTCREATORBUG-13889
Change-Id: I8a21665ce03a19ea96c09e9a5ccea59af995570d
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
It is very often a mistake to define a destructor without a copy (and move)
constructor and assignment operator. In C++11 no move constructor and
assignment operator will be generated if a destructor is defined. So it is
better to omit a lonely destructor in out template.
https://en.wikipedia.org/wiki/Rule_of_three_%28C%2B%2B_programming%29
Change-Id: If911556f872d878939f0f2fcaa974494a4df8a8a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Export the form contents as a list of lines and join them when
needed instead of hoping to unescape '\\n' in all places where
it is necessary.
This approach should be a bit saver since it will cause parse
errors in the wizard, which are more visible than broken output
in the generated files.
Task-number: QTCREATORBUG-13456
Change-Id: I434a9227082f92be3c2ce75006f61ac79a2b6fd6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
The fixup expando will be applied before validating a string in a
lineedit. It uses the special "%{INPUT}" variable for its input and
any change will be applied to the LineEdit.
Change-Id: Ia496eacdbe541d418acb4a977c274527387896ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Label respects the system palette, while Text does not.
Task-number: QTCREATORBUG-13189
Change-Id: Ife1796cd04216eef909820f85dfdfd9c403ae80f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
