This reverts commit 31904563bb.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.
Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.
Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Selection of Qt Quick component set
and use of specific QML template files (Qt Quick 1.0 and
com.nokia.symbian 1.0) based on the user selections.
Change-Id: I93cfa8735dcf285c76ff04a6186a4eca1f90a361
Reviewed-on: http://codereview.qt.nokia.com/567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
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>
As of Qt 4.8 the observer and jsdebugger services are part of Qt. This
means the following changes are necessary in Qt Creator:
* Do not link to the QmlJSDebugger library.
* Do not create JSDebuggerAgent and QDeclarativeViewObserver instances
in the QmlApplicationViewer and use the new declarative_debug CONFIG
option to enable those services in Qt. This is done automatically
for debug builds.
* Point out the QML Debugging Library and the QML Observer are "Not
needed" in the Qt options page.
* Change the label in qmake options from "Link QML debugging library" to
"Enable QML debugging". It still remains as a way to enable this
functionality in release builds or for QtQuick applications not based
on Qt Creator's template.
* Rely on qmlviewer for debugging QML UI projects rather than the
observer, which is no longer necessary.
Reviewed-by: Kai Koehne
And have that entry removed by the wizard. REMOVE_NEXT_LINE
is now the keyword for line removal. INCLUDE_DEPLOYMENT_PRI
was replaced by REMOVE_NEXT_LINE.
Make the html5applicationviewer class much less cluttered by splitting out all
the touch navigation classes into separate files in a subdirectory.
This should make it much more maintainable.
The "isEmpty(QMAKE_SH)" test is nonsense in the case of an msvc
build, because for msvc, sh.exe is never executed (although QMAKE_SH
is set.
"isEqual(QMAKE_DIR_SEP, \\)" is now the ultimate test. QMAKE_DIR_SEP
will only be "/" if sh.exe is in the path AND win32-g++ is used.
Task-Number: QTCREATORBUG-4455
The first parameter of qmake's replace function is a regular
expression. So it needs to be escaped once for the qmake parser,
and then for the regular expression.
When building with MinGW and sh.exe is in the path, we should/can
not use xcopy in our deployment code. This patch detects the
presence of sh.exe and adjusts the behavior accordingly.
'cp -r' is used directly instead of $(COPY_DIR), because the fix
for QTBUG-17315 is not yet in a released Qt version.
'mkdir -p' is used directly instead of $(MKDIR), because the
QMAKE_MKDIR for win32-g++ (in case of QMAKE_SH) does not have
the '-p'. A least not til Qt 4.7.3.
Task-Number: QTCREATORBUG-3094
Reviewed-by: Oswald Buddenhagen
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
This makes sure it gets deleted together with the QmlApplicationViewer,
rather than probably not at all when no parent is specified for the
viewer (which is the default).
Reviewed-by: Alessandro Portale
Reviewed-by: Christiaan Janssen
Locking the screen orientation was not a Qt feature of the Symbian
port till Qt 4.7.2. Therefore, client applications had to do the
locking themselves. That locking is right now only achievable by
using Avkon Api. The template code of the Qt Quick App wizard did
exactly that.
Now, Qt 4.7.2 has the screen orientation lock built in. That
implementation was done for QTBUG-11785. No need to do that in the
application code, anymore.
This patch removes Avkon usage from the templates, using new enum keys
and setting QWidget flags, just like Maemo5 does.
Two Qt version checks/fixes:
1) If the application tries to lock the orientation on Qt < 4.7.2,
a warning is given that this won't work
2) If Qt < 4.7.2 is used to build the application, the enum keys are
not used directly but casted from constants
Task-Number: QTCREATORBUG-3598
Reviewed-by: ck
Removes the "DEFINES += NETWORKACCESS" from the main .pro file
replacing it by "symbian:TARGET.CAPABILITY += NetworkServices".
Task-Number: QTCREATORBUG-3594
reviewed-by: con
The template code is similar to the Qt Quick App wizard
template code. It has a Viewer class +.pri which wrap the "dirty
stuff", a main .pro file and main.cpp file. In this case, there
is also a "Hello World" index.html file.
The "dirty stuff" code exposes a quit() function to the JavaScript
in the webview, which can be triggerd via the index.html.
As the 1-line-summary of this commit states, it is a dummy. Some-
one with proper knowlede about QtWebkit please provide better
template code.
Task-Number: QTCREATORBUG-3284
Also reorder the contents to have Qt Quick on top. Move Console Qt
to Other Projects.
Qt QWidget project isn't the best name, but the new structure is a
improvement so using it for now.
Task-Nr: QTCREATORBUG-3513
Ack-By: con
Ack-By: kkoehne
