diff --git a/demos/qmlaxes/main.cpp b/demos/qmlaxes/main.cpp index d569934..0513818 100644 --- a/demos/qmlaxes/main.cpp +++ b/demos/qmlaxes/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlaxes/loader.qml")); diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlchart/main.cpp b/demos/qmlchart/main.cpp index 277e1fa..1d8d019 100644 --- a/demos/qmlchart/main.cpp +++ b/demos/qmlchart/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlchart/loader.qml")); diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlcustomizations/main.cpp b/demos/qmlcustomizations/main.cpp index eacaeae..57c66de 100644 --- a/demos/qmlcustomizations/main.cpp +++ b/demos/qmlcustomizations/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlcustomizations/loader.qml")); diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlcustomlegend/main.cpp b/demos/qmlcustomlegend/main.cpp index 92e1a1f..1609635 100644 --- a/demos/qmlcustomlegend/main.cpp +++ b/demos/qmlcustomlegend/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); //viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlcustomlegend/loader.qml")); diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlcustommodel/main.cpp b/demos/qmlcustommodel/main.cpp index db54201..6f2ef20 100644 --- a/demos/qmlcustommodel/main.cpp +++ b/demos/qmlcustommodel/main.cpp @@ -32,6 +32,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // @uri QmlCustomModel qmlRegisterUncreatableType(uri, 1, 0, "AbstractItemModel", diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlf1legends/main.cpp b/demos/qmlf1legends/main.cpp index 0dec445..ca29113 100644 --- a/demos/qmlf1legends/main.cpp +++ b/demos/qmlf1legends/main.cpp @@ -28,6 +28,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) QScopedPointer app(createApplication(argc, argv)); QmlApplicationViewer viewer; + viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer.setSource(QUrl("qrc:/qml/qmlf1legends/main.qml")); viewer.setRenderHint(QPainter::Antialiasing, true); diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmloscilloscope/main.cpp b/demos/qmloscilloscope/main.cpp index 5baa7f8..62b2472 100644 --- a/demos/qmloscilloscope/main.cpp +++ b/demos/qmloscilloscope/main.cpp @@ -27,6 +27,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); DataSource dataSource(viewer.data()); viewer->rootContext()->setContextProperty("dataSource", &dataSource); diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlpolarchart/main.cpp b/demos/qmlpolarchart/main.cpp index f5f00cc..83eefcb 100644 --- a/demos/qmlpolarchart/main.cpp +++ b/demos/qmlpolarchart/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlpolarchart/loader.qml")); diff --git a/demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/qmlweather/main.cpp b/demos/qmlweather/main.cpp index 360ef83..74f3343 100644 --- a/demos/qmlweather/main.cpp +++ b/demos/qmlweather/main.cpp @@ -28,6 +28,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) QScopedPointer app(createApplication(argc, argv)); QmlApplicationViewer viewer; + viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto); QString appKey; if (argc > 1) { diff --git a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/demos/quick2chart/main.cpp b/demos/quick2chart/main.cpp index e02f45e..4f1466e 100644 --- a/demos/quick2chart/main.cpp +++ b/demos/quick2chart/main.cpp @@ -27,6 +27,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QtQuick2ApplicationViewer viewer; + viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/quick2chart/main.qml")); viewer.showExpanded(); diff --git a/demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 9d3970f..547602d 100644 --- a/demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -42,7 +42,6 @@ QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent) { connect(engine(), SIGNAL(quit()), SLOT(close())); setResizeMode(QQuickView::SizeRootObjectToView); - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml"))); } QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer() diff --git a/demos/quick2oscilloscope/main.cpp b/demos/quick2oscilloscope/main.cpp index f38b7ca..d1911df 100644 --- a/demos/quick2oscilloscope/main.cpp +++ b/demos/quick2oscilloscope/main.cpp @@ -29,6 +29,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QtQuick2ApplicationViewer viewer; + viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml"))); DataSource dataSource(&viewer); viewer.rootContext()->setContextProperty("dataSource", &dataSource); diff --git a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 9d3970f..547602d 100644 --- a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -42,7 +42,6 @@ QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent) { connect(engine(), SIGNAL(quit()), SLOT(close())); setResizeMode(QQuickView::SizeRootObjectToView); - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml"))); } QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer() diff --git a/examples/qmlpiechart/main.cpp b/examples/qmlpiechart/main.cpp index f250179..04bc853 100644 --- a/examples/qmlpiechart/main.cpp +++ b/examples/qmlpiechart/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlpiechart/main.qml")); diff --git a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/tests/qmlchartaxis/main.cpp b/tests/qmlchartaxis/main.cpp index 5e9387a..f298f30 100644 --- a/tests/qmlchartaxis/main.cpp +++ b/tests/qmlchartaxis/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlchartaxis/main.qml")); diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/tests/qmlchartproperties/main.cpp b/tests/qmlchartproperties/main.cpp index 33fcff3..bf99ea4 100644 --- a/tests/qmlchartproperties/main.cpp +++ b/tests/qmlchartproperties/main.cpp @@ -26,6 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer app(createApplication(argc, argv)); QScopedPointer viewer(QmlApplicationViewer::create()); + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlchartproperties/loader.qml")); diff --git a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp index fdd6b9e..0f12265 100644 --- a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -93,7 +93,6 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) new QmlJSDebugger::QDeclarativeViewObserver(this, this); #endif #endif - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); } QmlApplicationViewer::~QmlApplicationViewer() diff --git a/tests/quick2chartproperties/main.cpp b/tests/quick2chartproperties/main.cpp index 5fec3b8..099d7a7 100644 --- a/tests/quick2chartproperties/main.cpp +++ b/tests/quick2chartproperties/main.cpp @@ -27,6 +27,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QtQuick2ApplicationViewer viewer; + viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/quick2chartproperties/main.qml")); viewer.showExpanded(); diff --git a/tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 9d3970f..547602d 100644 --- a/tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -42,7 +42,6 @@ QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent) { connect(engine(), SIGNAL(quit()), SLOT(close())); setResizeMode(QQuickView::SizeRootObjectToView); - addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml"))); } QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer()