HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2234:db665d87eeda

demoLauncher should now work on all platforms

Marek Rosa -

r2234:db665d87eeda

parent child

Context file:

r2234:db665d87eeda

demos/demoLauncher/demoLauncher.pro +2 -1

             !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
-            include(charts/charts.pri)
             TARGET = demoLauncher
             SOURCES += main.cpp\
                     widget.cpp
             HEADERS  += widget.h
+            DEFINES += "BINPATH=$$join($$CHART_BUILD_BIN_DIR, ", ")"

demos/demoLauncher/widget.cpp +6 -4

             #include <QGridLayout>
             #include <QApplication>
             #include <QProcess>
-            #include <QTimer>
             Widget::Widget(QWidget *parent)
                 : QWidget(parent),
                   m_demoApp(0)
             {
                 QList<QFileInfo> appList;
+                QDir appFolder = QDir(BINPATH);
-                QDir appFolder(QApplication::applicationDirPath());
                 appList = appFolder.entryInfoList(QDir::Files);
                 for (int k = appList.count() - 1; k >= 0; k--) {
                     QString name = appList[k].fileName();
-                    if (name.endsWith("exp") || name.endsWith("dll") || name.endsWith("lib") || name.startsWith("tst_"))
+                    if (name.endsWith("exp")
+                            || name.endsWith("dll")
+                            || name.endsWith("lib")
+                            || name.startsWith("tst_")
+                            || name.startsWith("demoLauncher"))
                         appList.removeAt(k);
                 }

demos/demoLauncher/widget.h 0 -1

             public slots:
                 void runApp();
-            //    void runAppShow();
             private:
                 QProcess *m_demoApp;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages