Changeset 79a7671 in confclerk_git
- Timestamp:
- 08/30/17 21:15:52 (5 years ago)
- Branches:
- master, qt5
- Children:
- 30edeb7
- Parents:
- 809b5e5
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
confclerk.pro
r809b5e5 r79a7671 4 4 ISQT4 = $$find(QMAKEVERSION, ^[2-9]) 5 5 isEmpty( ISQT4 ) { 6 error("Use the qmake include with Qt4. 4or greater, on Debian that is qmake-qt4");6 error("Use the qmake include with Qt4.7 or greater, on Debian that is qmake-qt4"); 7 7 } 8 8 -
src/app/app.pro
r809b5e5 r79a7671 3 3 TARGET = confclerk 4 4 DESTDIR = ../bin 5 QT += sql xml network widgets 5 QT += sql xml network 6 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets 6 7 CONFIG(maemo5) { 7 8 QT += maemo5 -
src/gui/eventdialog.cpp
r809b5e5 r79a7671 28 28 #endif 29 29 30 QString toHtmlEscaped(const QString& string) { 31 #if QT_VERSION >= 0x050000 32 return string.toHtmlEscaped(); 33 #else 34 return Qt::escape(string); 35 #endif 36 } 37 30 38 EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialog(parent), mConferenceId(conferenceId), mEventId(eventId) { 31 39 setupUi(this); … … 39 47 QString info; 40 48 // title 41 info.append(QString("<h1>%1</h1>\n").arg( event.title().toHtmlEscaped()));49 info.append(QString("<h1>%1</h1>\n").arg(toHtmlEscaped(event.title()))); 42 50 43 51 // persons 44 52 info += QString("<h2>%1</h2>\n").arg(tr("Persons")); 45 53 QStringList persons = event.persons(); 46 for (int i = 0; i != persons.size(); ++i) persons[i] = persons[i].toHtmlEscaped();54 for (int i = 0; i != persons.size(); ++i) persons[i] = toHtmlEscaped(persons[i]); 47 55 info += QString("<p>%1</p>\n").arg(persons.join(", ")); 48 56 … … 72 80 if (url.isEmpty() || url == "http://") continue; 73 81 if (name.isEmpty()) name = url; 74 info += QString("<li><a href=\"%1\">%2</a></li>\n").arg( url.toHtmlEscaped(), name.toHtmlEscaped());82 info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(toHtmlEscaped(url), toHtmlEscaped(name)); 75 83 } 76 84 info += QString("</ul>\n"); -
src/gui/gui.pro
r809b5e5 r79a7671 6 6 QT += sql \ 7 7 xml \ 8 network \9 8 network 9 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets 10 10 QMAKE_CLEAN += ../bin/libgui.a 11 11 -
src/gui/mainwindow.h
r809b5e5 r79a7671 21 21 #define MAINWINDOW_H 22 22 23 #include "qglobal.h" 24 #if QT_VERSION >= 0x050000 23 25 #include <QtWidgets> 26 #else 27 #include <QtGui/QMainWindow> 28 #endif 24 29 #include <QSslError> 25 30 -
src/gui/searchhead.h
r809b5e5 r79a7671 21 21 #define SEARCHHEAD_H 22 22 23 #include "qglobal.h" 24 #if QT_VERSION >= 0x050000 23 25 #include <QtWidgets> 26 #else 27 #include <QtGui/QWidget> 28 #endif 24 29 #include <QDebug> 25 30 #include "ui_searchhead.h" -
src/mvc/delegate.h
r809b5e5 r79a7671 21 21 #define DELEGATE_H 22 22 23 #include "qglobal.h" 24 #if QT_VERSION >= 0x050000 23 25 #include <QtWidgets> 26 #else 27 #include <QtGui> 28 #endif 24 29 25 30 class Delegate : public QItemDelegate -
src/mvc/eventmodel.cpp
r809b5e5 r79a7671 177 177 if (!parent.isValid()) 178 178 { 179 return createIndex(row, column , (quintptr) 0);179 return createIndex(row, column); 180 180 } 181 181 else if (parent.internalId() == 0) … … 202 202 Event * event = static_cast<Event*>(index.internalPointer()); 203 203 204 return createIndex(mParents[event->id()], 0 , (quintptr) 0);204 return createIndex(mParents[event->id()], 0); 205 205 } 206 206 -
src/mvc/mvc.pro
r809b5e5 r79a7671 4 4 DESTDIR = ../bin 5 5 CONFIG += static 6 QT += sql \7 6 QT += sql 7 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets 8 8 QMAKE_CLEAN += ../bin/libmvc.a 9 9 -
src/sql/sqlengine.cpp
r809b5e5 r79a7671 24 24 #include <QVariant> 25 25 #include <QDateTime> 26 #include "qglobal.h" 27 #if QT_VERSION >= 0x050000 26 28 #include <QStandardPaths> 29 #else 30 #include <QDesktopServices> 31 #endif 27 32 28 33 #include <QDir> … … 37 42 38 43 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) { 44 #if QT_VERSION >= 0x050000 39 45 QDir dbPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); 46 #else 47 QDir dbPath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); 48 #endif 40 49 dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite"); 41 50 }
Note: See TracChangeset
for help on using the changeset viewer.