From 4d57f6bc4795bc207fb7af2411005958e9576e3e Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Tue, 16 Oct 2018 10:24:07 +0200
Subject: [PATCH] QtQuick: Fix & clean up alarms.pro
The current example didn't compile on Windows, because all Qt examples
require a target file.
Also clean up unnecessary parts generated by the Qt Creator wizard.
Change-Id: I40b834e544a146d3e232844e667d568b102bec5c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
examples/tutorials/alarms/alarms.pro | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/examples/tutorials/alarms/alarms.pro b/examples/tutorials/alarms/alarms.pro
index 6c54c7f8..14fc29a8 100644
--- a/examples/tutorials/alarms/alarms.pro
+++ b/examples/tutorials/alarms/alarms.pro
@@ -1,29 +1,10 @@
-QT += qml quick
+TEMPLATE = app
-CONFIG += c++11
+QT += quick
SOURCES += main.cpp
RESOURCES += qml.qrc
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH = $$PWD/imports
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-TARGET = Alarms
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
+target.path = $$[QT_INSTALL_EXAMPLES]/demos/alarms
+INSTALLS += target
--
GitLab