Commit Graph

34 Commits

Author SHA1 Message Date
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
2012-10-25 10:45:58 +02:00
Alessandro Portale
6b7501a1e2 Appwizard test: Fix compilation and warnings
Change-Id: I6ec16d21c2c8554637361a48deddc71ebb52e7ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 16:12:34 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Eike Ziller
a8c524d40a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/wizards/qtquickapp.cpp

Change-Id: I6ece61c73bc32e93912ad1b489871c597ab60d5b
2012-09-05 13:42:31 +02:00
Alessandro Portale
8d6566b68b QtQuick 2 Application Wizard
This patch adds a new variant of the good old ugly
QmlApplicationViewer wizard. The new one is QQuickView based,
and thus targets QtQuick2

Change-Id: I049223f644029e75bd15120b003c0ce4907a547a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-04 20:32:33 +02:00
Alessandro Portale
e6270852a3 Qt Quick App Wizards: Remove dead code
Initially, the wizard was able to make complex QML apps
with custom QML plugins deployable. That was then removed
from the UI. Let's now also remove the remainders.

Change-Id: If470d553c79d0e47bc8e4f0e814a0da2ef31bab6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 18:05:43 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Christian Kandeler
a64cff731f Remove catch-all include statement from app wizard test.
Change-Id: I558378a486e45fc93be6ed26b94b8db91e785b45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-05-02 18:26:09 +02:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Alessandro Portale
768c4ef082 Consistent names for AbstractGeneratedFileInfo::FileType keys
Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0
Reviewed-on: http://codereview.qt-project.org/4828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-09-20 17:56:30 +02:00
Thomas Murach
a4c4d67772 corrected license headers
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
2011-07-06 17:56:15 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-06 11:14:01 +02:00
Christian Kandeler
84f60e5fda Maemo: Use different desktop files for Fremantle and Harmattan.
So far, we desperately tried not to duplicate the desktop file,
resorting to all kinds of "clever" heuristics in the process.
This is, however, somewhat limiting and confusing to users,
because we do magic stuff behind their backs.
So it seems better to "give up" and use two desktop files.

Change-Id: Idf969eb3ad365f080e5a9c1608149ea6de629d5c
Reviewed-on: http://codereview.qt.nokia.com/31
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-05-23 13:10:56 +02:00
Christian Kandeler
12b2a5fff0 Maemo: Harmattan application icons are now 80x80 pixels big.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=250237
2011-04-29 09:45:35 +02:00
Christian Kandeler
52f43920d8 App wizards test: Adapt to introduction of FileSaver. 2011-04-29 09:45:35 +02:00
Alessandro Portale
4459061116 Fix the main .qml gile generation in the manual test. 2011-04-17 09:57:07 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Alessandro Portale
dece4dccc7 Added (optional) touch optimized navigation of HTML5 apps
Code provided by the Bostoner Browser team.

The HTML5 wizard shows a checkbox "Enable touch optimized navigation"
which enables flicking and enlarged click areas. By default, the
option is turned off.

Task-Number: QTCREATORBUG-3284
2011-03-18 17:34:09 +01:00
Kai Koehne
7365be7cf6 MobileWizard: Export library symbols to allow wizards in external plugins
Qt components want to provide Qt Quick Application wizards in their own
repos. Allow them to use the MobileAppWizard infrastructure.

Reviewed-by: Alessandro Portale
2011-03-16 15:29:05 +01:00
Bill King
3593fe08ae tests: add licence headers 2011-02-18 14:48:16 +01:00
Alessandro Portale
8678af3240 Refacoring. Saner Api for QtQuickApp.
Now using an explicit Mode (generated, imported) instead of empty
or set filename convention. Just like in Html5App.
2011-02-09 21:39:46 +01:00
Alessandro Portale
aa453c8062 Implemented "import" and "Url" options for html5 app wizard 2011-02-09 16:23:45 +01:00
Alessandro Portale
2eb2f61c35 Name exported test projects properly. 2011-02-09 16:23:45 +01:00
Alessandro Portale
99bbdc53bb Rename test html to sometheing elste than "index.html" 2011-02-09 16:23:44 +01:00
Alessandro Portale
09d387f5fa Fix the "quit" handler 2011-02-09 16:23:44 +01:00
Alessandro Portale
d2cfe6cb05 Test data for html5 import 2011-02-08 18:07:27 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00
Alessandro Portale
7870769a30 Html5 app wizard. First steps.
Task-Number: QTCREATORBUG-3284
2011-02-06 14:08:52 +01:00
Alessandro Portale
cc9f5a0192 Another rename of the wizard auto test 2011-02-03 19:48:13 +01:00
Alessandro Portale
7bfc798a7d qmlstandalone -> appwizards (second attempt) 2011-01-27 17:05:40 +01:00
Alessandro Portale
b25070a922 Renamed: qmlstandalone -> appwizards
That test will be for Qt Quick app and Html5 app wizard testing.
2011-01-26 23:19:47 +01:00