HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r922:d40a04983d6a

charts.pro +1 -1

              !include(common.pri) {
                  error('missing common.pri')
              }
              TEMPLATE = subdirs
-             SUBDIRS += src examples demos test qmlplugin
+             SUBDIRS += src qmlplugin examples demos test
              integrated_build:{
                  message('Configured for integrated build against local libs...')
              } else {
                  message('Running build aginst system libs...')
                  message('Please build example test and qmlplugin after installing library.')
              }
              CONFIG += ordered
              QMAKE_CXXFLAGS += -g -Wall
              unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
              win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
              # install feature file
              feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
              feature.files = $$PWD/features/qtcommercialchart.prf
              INSTALLS += feature
              docs.target = docs
              win32:{
                  docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
              }else{
                  docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
              }
              docs.depends = FORCE
              QMAKE_EXTRA_TARGETS += docs

demos/demos.pro +2 -1

              TEMPLATE = subdirs
              SUBDIRS += chartthemes \
                         piechartcustomization \
-                        gdpbarchart
+                        gdpbarchart \
+                        qmlchart

demos/piechartcustomization/piechartcustomization.pro +1 -1

              !include( ../demos.pri ) {
-              error( "Couldn't find the examples.pri file!" )
+              error( "Couldn't find the demos.pri file!" )
              }
              TARGET = piechartcustomization
              SOURCES += main.cpp \
                  pentool.cpp \
                  brushtool.cpp \
                  customslice.cpp \
                  mainwidget.cpp
              HEADERS += \
                  pentool.h \
                  brushtool.h \
                  customslice.h \
                  mainwidget.h

demos/qmlchart/main.cpp ~~test/qmlchart/main.cpp~~ renamed 0 0

NO CONTENT: file renamed from test/qmlchart/main.cpp to demos/qmlchart/main.cpp

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp ~~test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp~~ renamed 0 0

NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h ~~test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h~~ renamed 0 0

NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri ~~test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri~~ renamed 0 0

NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri

demos/qmlchart/qmlchart.pro ~~test/qmlchart/qmlchart.pro~~ renamed +2 -6

-             !include( ../test.pri ) {
-                 error( "Couldn't find the common.pri file!" )
+             !include( ../demos.pri ) {
+                 error( "Couldn't find the demos.pri file!" )
              }
              integrated_build:{
                  message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR)
              }
              RESOURCES += \
                  resources.qrc
              # Add more folders to ship with the application, here
              folder_01.source = qml/qmlchart
              folder_01.target = qml
              DEPLOYMENTFOLDERS = folder_01
              # Additional import path used to resolve QML modules in Creator's code model
              QML_IMPORT_PATH =
              symbian:TARGET.UID3 = 0xE421236E
              # Smart Installer package's UID
              # This UID is from the protected range and therefore the package will
              # fail to install if self-signed. By default qmake uses the unprotected
              # range value if unprotected UID is defined for the application and
              # 0x2002CCCF value if protected UID is given to the application
              #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
              # Allow network access on Symbian
              symbian:TARGET.CAPABILITY += NetworkServices
              # If your application uses the Qt Mobility libraries, uncomment the following
              # lines and add the respective components to the MOBILITY variable.
              # CONFIG += mobility
              # MOBILITY +=
              # Speed up launching on MeeGo/Harmattan when using applauncherd daemon
              # CONFIG += qdeclarative-boostable
              # Add dependency to Symbian components
              # CONFIG += qt-components
              # The .cpp file which was generated for your project. Feel free to hack it.
              SOURCES += main.cpp
              # Please do not modify the following two lines. Required for deployment.
              include(qmlapplicationviewer/qmlapplicationviewer.pri)
              qtcAddDeployment()
-             #HEADERS += \
-             #    chart.h

demos/qmlchart/qmlchart.svg ~~test/qmlchart/qmlchart.svg~~ renamed 0 0

NO CONTENT: file renamed from test/qmlchart/qmlchart.svg to demos/qmlchart/qmlchart.svg

demos/qmlchart/resources.qrc ~~test/qmlchart/resources.qrc~~ renamed 0 -1

              <RCC>
                  <qresource prefix="/">
                      <file>qml/qmlchart/loader.qml</file>
                      <file>qml/qmlchart/main.qml</file>
                      <file>qml/qmlchart/View1.qml</file>
                      <file>qml/qmlchart/View2.qml</file>
                      <file>qml/qmlchart/View3.qml</file>
-                     <file>qml/qmlchart/View4.qml</file>
                  </qresource>
              </RCC>

integrated.pri +14 -14

              integrated_build:{
                  INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
                  !win32: {
                      LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
                  }else{
                      win32-msvc*: {
                          # hack fix for error:
                          #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
                          QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
                      }else{
                          LIBS += -L $$CHART_BUILD_LIB_DIR
                      }
                  }
                  CONFIG(debug, debug|release) {
                      LIBS += -lQtCommercialChartd
                      #this is ugly hack to work around missing rpath, it simply copies lib
                      win32:{
                          copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                          copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
                          copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
                          PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                          QMAKE_EXTRA_TARGETS +=copylib
                      }
                  } else {
                      LIBS += -lQtCommercialChart
                      #this is ugly hack to work around missing rpath, it simply copies lib
                      win32: {
                          copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
                          copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
                          copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
                          PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
                          QMAKE_EXTRA_TARGETS +=copylib
                      }
                  }
                  mac: {
                      # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
                      CHARTS_LIB_NAME = libQtCommercialChart.1.dylib
                      CONFIG(debug, debug|release) {
                          CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
                      }
-                     TARGET_PATH = ""
+                     BIN_TARGET_PATH = ""
                      exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
-                         TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
+                         BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
                      }
                      exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
                          # Executable in test folder
-                         TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
+                         BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
                      }
                      exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
                          # Executable in test folder with custom target "tst_NNN"
-                         TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
+                         BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
                      }
                      exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
                          # Plugin
-                         TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
+                         BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
                      }
-                     !isEmpty (TARGET_PATH) {
-                         QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$TARGET_PATH
-                         #message($$QMAKE_POST_LINK)
+                     }
-                     # Hack to make qml plugins available as internal build versions
-                     exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
-                         QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
-                         #message($$QMAKE_POST_LINK)
+                     !isEmpty (BIN_TARGET_PATH) {
+                         QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH
+                         message($$QMAKE_POST_LINK)
+                     } else {
+                         # Hack to make qml plugins available as internal build versions
+                         exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
+                             QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
+                             message($$QMAKE_POST_LINK)
+                         }
                      }
                  }
              } else {
                  CONFIG += qtcommercialchart
              }

test/test.pro +1 -2

              TEMPLATE = subdirs
              SUBDIRS += \
                  chartwidgettest \
-                 wavechart \
-                 qmlchart
+                 wavechart
              !win32:{
                  SUBDIRS += auto
              }

test/qmlchart/qml/qmlchart/View1.qml removed 0 -51

NO CONTENT: file was removed

test/qmlchart/qml/qmlchart/View2.qml removed 0 -57

NO CONTENT: file was removed

test/qmlchart/qml/qmlchart/View3.qml removed 0 -128

NO CONTENT: file was removed

test/qmlchart/qml/qmlchart/View4.qml removed 0 -57

NO CONTENT: file was removed

test/qmlchart/qml/qmlchart/loader.qml removed 0 -37

NO CONTENT: file was removed

test/qmlchart/qml/qmlchart/main.qml removed 0 -53

NO CONTENT: file was removed

test/qmlchart/qmlchart.desktop removed 0 -11

NO CONTENT: file was removed

test/qmlchart/qmlchart64.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

test/qmlchart/qmlchart80.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

test/qmlchart/qmlchart_harmattan.desktop removed 0 -11

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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