HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2050:0fecbcb1f664

Qt5: fix declarative/quick1 module include

Marek Rosa -

r2050:0fecbcb1f664

parent child

Context file:

r2050:0fecbcb1f664

Collapse all files

demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

             # checksum 0x5b42 version 0x70013
             # This file was generated by the Qt Quick Application wizard of Qt Creator.
             # The code below adds the QmlApplicationViewer to the project and handles the
             # activation of QML debugging.
             # It is recommended not to modify this file, since newer versions of Qt Creator
             # may offer an updated version of it.
-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }
             contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
                 DEFINES += HARMATTAN_BOOSTER
             }
             # This file was generated by an application wizard of Qt Creator.
             # The code below handles deployment to Symbian and Maemo, aswell as copying
             # of the application data to shadow build directories on desktop.
             # It is recommended not to modify this file, since newer versions of Qt Creator
             # may offer an updated version of it.
             defineTest(qtcAddDeployment) {
             for(deploymentfolder, DEPLOYMENTFOLDERS) {
                 item = item$${deploymentfolder}
                 itemsources = $${item}.sources
                 $$itemsources = $$eval($${deploymentfolder}.source)
                 itempath = $${item}.path
                 $$itempath= $$eval($${deploymentfolder}.target)
                 export($$itemsources)
                 export($$itempath)
                 DEPLOYMENT += $$item
             }
             MAINPROFILEPWD = $$PWD
             symbian {
                 isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
                 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
             } else:win32 {
                 copyCommand =
                 for(deploymentfolder, DEPLOYMENTFOLDERS) {
                     source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
                     source = $$replace(source, /, \\)
                     sourcePathSegments = $$split(source, \\)
                     target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
                     target = $$replace(target, /, \\)
                     target ~= s,\\\\\\.?\\\\,\\,
                     !isEqual(source,$$target) {
                         !isEmpty(copyCommand):copyCommand += &&
                         isEqual(QMAKE_DIR_SEP, \\) {
                             copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
                         } else {
                             source = $$replace(source, \\\\, /)
                             target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
                             target = $$replace(target, \\\\, /)
                             copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
                         }
                     }
                 }
                 !isEmpty(copyCommand) {
                     copyCommand = @echo Copying application data... && $$copyCommand
                     copydeploymentfolders.commands = $$copyCommand
                     first.depends = $(first) copydeploymentfolders
                     export(first.depends)
                     export(copydeploymentfolders.commands)
                     QMAKE_EXTRA_TARGETS += first copydeploymentfolders
                 }
             } else:unix {
                 maemo5 {
                     desktopfile.files = $${TARGET}.desktop
                     desktopfile.path = /usr/share/applications/hildon
                     icon.files = $${TARGET}64.png
                     icon.path = /usr/share/icons/hicolor/64x64/apps
                 } else:!isEmpty(MEEGO_VERSION_MAJOR) {
                     desktopfile.files = $${TARGET}_harmattan.desktop
                     desktopfile.path = /usr/share/applications
                     icon.files = $${TARGET}80.png
                     icon.path = /usr/share/icons/hicolor/80x80/apps
                 } else { # Assumed to be a Desktop Unix
                     copyCommand =
                     for(deploymentfolder, DEPLOYMENTFOLDERS) {
                         source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
                         source = $$replace(source, \\\\, /)
                         macx {
                             target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
                         } else {
                             target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
                         }
                         target = $$replace(target, \\\\, /)
                         sourcePathSegments = $$split(source, /)
                         targetFullPath = $$target/$$last(sourcePathSegments)
                         targetFullPath ~= s,/\\.?/,/,
                         !isEqual(source,$$targetFullPath) {
                             !isEmpty(copyCommand):copyCommand += &&
                             copyCommand += $(MKDIR) \"$$target\"
                             copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
                         }
                     }
                     !isEmpty(copyCommand) {
                         copyCommand = @echo Copying application data... && $$copyCommand
                         copydeploymentfolders.commands = $$copyCommand
                         first.depends = $(first) copydeploymentfolders
                         export(first.depends)
                         export(copydeploymentfolders.commands)
                         QMAKE_EXTRA_TARGETS += first copydeploymentfolders
                     }
                 }
                 installPrefix = /opt/$${TARGET}
                 for(deploymentfolder, DEPLOYMENTFOLDERS) {
                     item = item$${deploymentfolder}
                     itemfiles = $${item}.files
                     $$itemfiles = $$eval($${deploymentfolder}.source)
                     itempath = $${item}.path
                     $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
                     export($$itemfiles)
                     export($$itempath)
                     INSTALLS += $$item
                 }
                 !isEmpty(desktopfile.path) {
                     export(icon.files)
                     export(icon.path)
                     export(desktopfile.files)
                     export(desktopfile.path)
                     INSTALLS += icon desktopfile
                 }
                 target.path = $${installPrefix}/bin
                 export(target.path)
                 INSTALLS += target
             }
             export (ICON)
             export (INSTALLS)
             export (DEPLOYMENT)
             export (TARGET.EPOCHEAPSIZE)
             export (TARGET.CAPABILITY)
             export (LIBS)
             export (QMAKE_EXTRA_TARGETS)
             }

demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

             # checksum 0x5b42 version 0x70013
             # This file was generated by the Qt Quick Application wizard of Qt Creator.
             # The code below adds the QmlApplicationViewer to the project and handles the
             # activation of QML debugging.
             # It is recommended not to modify this file, since newer versions of Qt Creator
             # may offer an updated version of it.
-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }
             contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
                 DEFINES += HARMATTAN_BOOSTER
             }
             # This file was generated by an application wizard of Qt Creator.
             # The code below handles deployment to Symbian and Maemo, aswell as copying
             # of the application data to shadow build directories on desktop.
             # It is recommended not to modify this file, since newer versions of Qt Creator
             # may offer an updated version of it.
             defineTest(qtcAddDeployment) {
             for(deploymentfolder, DEPLOYMENTFOLDERS) {
                 item = item$${deploymentfolder}
                 itemsources = $${item}.sources
                 $$itemsources = $$eval($${deploymentfolder}.source)
                 itempath = $${item}.path
                 $$itempath= $$eval($${deploymentfolder}.target)
                 export($$itemsources)
                 export($$itempath)
                 DEPLOYMENT += $$item
             }
             MAINPROFILEPWD = $$PWD
             symbian {
                 isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
                 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
             } else:win32 {
                 copyCommand =
                 for(deploymentfolder, DEPLOYMENTFOLDERS) {
                     source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
                     source = $$replace(source, /, \\)
                     sourcePathSegments = $$split(source, \\)
                     target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
                     target = $$replace(target, /, \\)
                     target ~= s,\\\\\\.?\\\\,\\,
                     !isEqual(source,$$target) {
                         !isEmpty(copyCommand):copyCommand += &&
                         isEqual(QMAKE_DIR_SEP, \\) {
                             copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
                         } else {
                             source = $$replace(source, \\\\, /)
                             target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
                             target = $$replace(target, \\\\, /)
                             copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
                         }
                     }
                 }
                 !isEmpty(copyCommand) {
                     copyCommand = @echo Copying application data... && $$copyCommand
                     copydeploymentfolders.commands = $$copyCommand
                     first.depends = $(first) copydeploymentfolders
                     export(first.depends)
                     export(copydeploymentfolders.commands)
                     QMAKE_EXTRA_TARGETS += first copydeploymentfolders
                 }
             } else:unix {
                 maemo5 {
                     desktopfile.files = $${TARGET}.desktop
                     desktopfile.path = /usr/share/applications/hildon
                     icon.files = $${TARGET}64.png
                     icon.path = /usr/share/icons/hicolor/64x64/apps
                 } else:!isEmpty(MEEGO_VERSION_MAJOR) {
                     desktopfile.files = $${TARGET}_harmattan.desktop
                     desktopfile.path = /usr/share/applications
                     icon.files = $${TARGET}80.png
                     icon.path = /usr/share/icons/hicolor/80x80/apps
                 } else { # Assumed to be a Desktop Unix
                     copyCommand =
                     for(deploymentfolder, DEPLOYMENTFOLDERS) {
                         source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
                         source = $$replace(source, \\\\, /)
                         macx {
                             target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
                         } else {
                             target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
                         }
                         target = $$replace(target, \\\\, /)
                         sourcePathSegments = $$split(source, /)
                         targetFullPath = $$target/$$last(sourcePathSegments)
                         targetFullPath ~= s,/\\.?/,/,
                         !isEqual(source,$$targetFullPath) {
                             !isEmpty(copyCommand):copyCommand += &&
                             copyCommand += $(MKDIR) \"$$target\"
                             copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
                         }
                     }
                     !isEmpty(copyCommand) {
                         copyCommand = @echo Copying application data... && $$copyCommand
                         copydeploymentfolders.commands = $$copyCommand
                         first.depends = $(first) copydeploymentfolders
                         export(first.depends)
                         export(copydeploymentfolders.commands)
                         QMAKE_EXTRA_TARGETS += first copydeploymentfolders
                     }
                 }
                 installPrefix = /opt/$${TARGET}
                 for(deploymentfolder, DEPLOYMENTFOLDERS) {
                     item = item$${deploymentfolder}
                     itemfiles = $${item}.files
                     $$itemfiles = $$eval($${deploymentfolder}.source)
                     itempath = $${item}.path
                     $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
                     export($$itemfiles)
                     export($$itempath)
                     INSTALLS += $$item
                 }
                 !isEmpty(desktopfile.path) {
                     export(icon.files)
                     export(icon.path)
                     export(desktopfile.files)
                     export(desktopfile.path)
                     INSTALLS += icon desktopfile
                 }
                 target.path = $${installPrefix}/bin
                 export(target.path)
                 INSTALLS += target
             }
             export (ICON)
             export (INSTALLS)
             export (DEPLOYMENT)
             export (TARGET.EPOCHEAPSIZE)
             export (TARGET.CAPABILITY)
             export (LIBS)
             export (QMAKE_EXTRA_TARGETS)
             }

examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

plugins/declarative/declarative.pro +5 -1

             !include( ../plugins.pri ) {
                 error( "Couldn't find the plugins.pri file!" )
             }
             TARGET = qtcommercialchartqml
-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
             INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
             CONFIG(debug, debug|release) {
               mac: TARGET = $$join(TARGET,,,_debug)
               win32: TARGET = $$join(TARGET,,,d)
             }
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativexypoint.cpp \
                 declarativexyseries.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp \
                 declarativecategoryaxis.cpp \
                 declarativemargins.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexypoint.h \
                 declarativexyseries.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h \
                 declarativecategoryaxis.h \
                 declarativemargins.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir
             FILE = $$PWD/qmldir
             win32:{FILE = $$replace(FILE, "/","\\")}
             QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_QML_PLUGIN_DIR

tests/auto/qml/qml.pro +5 -1

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_qml.cpp
-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }

tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

General Comments 0

Write
Preview

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

No TODOs yet

	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