Compile Windows

src/plugins/qt4projectmanager/qt-s60/qt-s60.pri

@@ -22,5 +22,5 @@ SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
         $$PWD/rvcttoolchain.h
     FORMS += $$PWD/s60devicespreferencepane.ui
     OTHER_FILES += $$PWD/qt-s60-todo.txt
-    include($$PWD/../../../../tests/manual/trk/trklauncher.pri)||error("could not include trklauncher.pri")
+    include(../../shared/trk/trk.pri)||error("could not include trk.pri")
 }

src/shared/trk/launcher.cpp

@@ -40,8 +40,6 @@
 
 namespace trk {
 
-typedef TrkWriteQueueDevice::TrkCallback TrkCallback;
-
 struct LauncherPrivate {
     struct CopyState {
         QString sourceFileName;
@@ -52,7 +50,7 @@ struct LauncherPrivate {
     };
 
     LauncherPrivate();
-    TrkWriteQueueDevice m_device;
+    TrkDevice m_device;
     QString m_trkServerName;
     QByteArray m_trkReadBuffer;
 

src/shared/trk/trk.pri

@@ -4,8 +4,10 @@ INCLUDEPATH *= $$PWD
 HEADERS += \
     $$PWD/callback.h \
     $$PWD/trkutils.h \
-    $$PWD/trkdevice.h 
+    $$PWD/trkdevice.h \
+    $$PWD/launcher.h
 
 SOURCES += \
     $$PWD/trkutils.cpp \
-    $$PWD/trkdevice.cpp  
+    $$PWD/trkdevice.cpp \
+    $$PWD/launcher.cpp