Commit ac2e53fd authored by David Kaspar's avatar David Kaspar

Qnx: Fixing bb-cascades-app project template

Now it uses ProjectName:s and ProjectName:h so source code
is generated correctly.

Task-number: QTCREATORBUG-10227
Change-Id: Iecf5250e765def70d7a1d2833a02f3b2a7c3e863
Reviewed-by: default avatarDavid Kaspar <dkaspar@blackberry.com>
Reviewed-by: default avatarTobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: default avatarMehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
parent 39dd9d07
......@@ -7,7 +7,7 @@ Q_DECL_EXPORT int main(int argc, char **argv)
{
bb::cascades::Application app(argc, argv);
new %ProjectName%(&app);
new %ProjectName:s%(&app);
return bb::cascades::Application::exec();
}
......@@ -4,7 +4,7 @@
#include <bb/cascades/QmlDocument>
#include <bb/cascades/AbstractPane>
%ProjectName%::%ProjectName%(bb::cascades::Application *app)
%ProjectName:s%::%ProjectName:s%(bb::cascades::Application *app)
: QObject(app)
{
bb::cascades::QmlDocument *qml = bb::cascades::QmlDocument::create("asset:///main.qml").parent(this);
......
#ifndef %ProjectName%_HPP_
#define %ProjectName%_HPP_
#ifndef %ProjectName:h%_HPP_
#define %ProjectName:h%_HPP_
#include <QObject>
namespace bb { namespace cascades { class Application; }}
class %ProjectName% : public QObject
class %ProjectName:s% : public QObject
{
Q_OBJECT
public:
%ProjectName%(bb::cascades::Application *app);
virtual ~%ProjectName%() {}
%ProjectName:s%(bb::cascades::Application *app);
virtual ~%ProjectName:s%() {}
};
#endif /* %ProjectName%_HPP_ */
#endif /* %ProjectName:h%_HPP_ */
TEMPLATE = app
# Additional import path used to resolve QML modules in Creator's code model
LIBS += -lbbdata -lbb -lbbcascades
QT += declarative xml
# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp \
%ProjectName%.cpp
......@@ -14,5 +11,3 @@ HEADERS += %ProjectName%.hpp
OTHER_FILES += bar-descriptor.xml \
assets/main.qml \
assets/SecondPage.qml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment